particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop internal/common/distro.go in favor of osbuild/images

Browse source 
Drop `common.GetHostDistroName()` implementation and use
`distro.GetHostDistroName()` from the osbuild/images instead.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2024-01-19 21:05:46 +01:00 • committed by Achilleas Koutsou
parent fb1b27c0ef
commit c4e5ab5aca
5 changed files with 5 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/boot/context-managers.go
View file

@ -14,6 +14,7 @@ import (
"time"
"github.com/osbuild/images/pkg/arch"
"github.com/osbuild/images/pkg/distro"
"github.com/osbuild/osbuild-composer/cmd/osbuild-image-tests/constants"
"github.com/osbuild/osbuild-composer/internal/common"
)
@ -114,7 +115,7 @@ func WithBootedQemuImage(image string, ns NetNS, f func() error) error {
var qemuCmd *exec.Cmd
if common.CurrentArch() == "x86_64" {
hostDistroName, _, _, err := common.GetHostDistroName()
hostDistroName, err := distro.GetHostDistroName()
if err != nil {
return fmt.Errorf("cannot determing the current distro: %v", err)
}