From db8f8298dd02978512938c86382b7f8ceae3ac85 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 30 Jun 2026 14:57:40 +0200 Subject: [PATCH 1/2] fix podman machine os upgrade distro check We renamed the variant in machine-os to podman-machine-os so it is not coreos: https://github.com/podman-container-tools/podman-machine-os/commit/a5c8fbcfc6225fc0e1a7b2c8a49d10ad352ab480 Now the main issue with this is the code runs inside the VM, which means updates from 6.0.0 to the next one still will be broken and needs the os apply command until this can work again. Of course a new init will also work with the new image. Fixes: #29085 Signed-off-by: Paul Holzinger --- cmd/podman/machine/os/manager.go | 5 +++-- docs/source/markdown/podman-machine-os-upgrade.1.md | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/podman/machine/os/manager.go b/cmd/podman/machine/os/manager.go index 7dc6156bcb..f47a24dde8 100644 --- a/cmd/podman/machine/os/manager.go +++ b/cmd/podman/machine/os/manager.go @@ -5,6 +5,7 @@ package os import ( "bufio" "errors" + "fmt" "os" "strings" @@ -54,10 +55,10 @@ func NewOSManager(opts ManagerOpts) (pkgOS.Manager, error) { func guestOSManager() (pkgOS.Manager, error) { dist := GetDistribution() switch { - case dist.Name == "fedora" && dist.Variant == "coreos": + case dist.Name == "fedora" && dist.Variant == "podman-machine-os": return &pkgOS.OSTree{}, nil default: - return nil, errors.New("unsupported OS") + return nil, fmt.Errorf("unsupported OS/Variant: %s/%s", dist.Name, dist.Variant) } } diff --git a/docs/source/markdown/podman-machine-os-upgrade.1.md b/docs/source/markdown/podman-machine-os-upgrade.1.md index a3911a66a3..89c3c76b97 100644 --- a/docs/source/markdown/podman-machine-os-upgrade.1.md +++ b/docs/source/markdown/podman-machine-os-upgrade.1.md @@ -18,6 +18,8 @@ then the OS changes will be applied to `podman-machine-default`. The machine must be started for this command to be run. +Note: This command is not supported with the WSL machine provider. + ### UPGRADE LOGIC The upgrade function compares the client version against the machine version using semantic versioning (major.minor From 5cdc6f80c0e967e32d85ff326dae28e97f2d7612 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 30 Jun 2026 15:08:32 +0200 Subject: [PATCH 2/2] label machine issues automatically In podman info we print the os variant so use that to label the issue with 'machine'. Signed-off-by: Paul Holzinger --- .github/issue-labeler.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml index e285749a96..8402564232 100644 --- a/.github/issue-labeler.yml +++ b/.github/issue-labeler.yml @@ -11,3 +11,7 @@ macos: remote: # we cannot use multiline regex so we check for serviceIsRemote in podman info - 'serviceIsRemote:\strue' + +machine: + # machine-os uses its own variant so use that to label issues with machine based on podman info + - 'variant:\spodman-machine-os'