opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 09:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(machine): improve machine marker value

Browse Source 
1. Set the marker to the current virtual machine type instead of fixed qemu.
2. Update containers/common

[NO NEW TESTS NEEDED]

Signed-off-by: Black-Hole1 <bh@bugs.cc>
This commit is contained in:
Black-Hole1
2023-11-28 10:10:38 +08:00
parent e4cdd4b35a
commit a2bf8c6d50
35 changed files with 361 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
vendor/github.com/containers/common/pkg/machine/machine.go generated vendored
View File

@ -9,10 +9,7 @@ import (
"github.com/sirupsen/logrus"
)
// TODO: change name to MachineMarker since package is already called machine
//
//nolint:revive
type MachineMarker struct {
type Marker struct {
Enabled bool
Type string
}
@ -21,11 +18,13 @@ const (
markerFile = "/etc/containers/podman-machine"
Wsl = "wsl"
Qemu = "qemu"
AppleHV = "applehv"
HyperV = "hyperv"
)
var (
markerSync sync.Once
machineMarker *MachineMarker
markerSync sync.Once
marker *Marker
)
func loadMachineMarker(file string) {
@ -39,7 +38,7 @@ func loadMachineMarker(file string) {
kind = strings.TrimSpace(string(content))
}
machineMarker = &MachineMarker{enabled, kind}
marker = &Marker{enabled, kind}
}
func isLegacyConfigSet() bool {
@ -57,20 +56,17 @@ func IsPodmanMachine() bool {
return GetMachineMarker().Enabled
}
// TODO: change name to HostType since package is already called machine
//
//nolint:revive
func MachineHostType() string {
func HostType() string {
return GetMachineMarker().Type
}
func IsGvProxyBased() bool {
return IsPodmanMachine() && MachineHostType() != Wsl
return IsPodmanMachine() && HostType() != Wsl
}
func GetMachineMarker() *MachineMarker {
func GetMachineMarker() *Marker {
markerSync.Do(func() {
loadMachineMarker(markerFile)
})
return machineMarker
return marker
}