containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move `DefaultMachineName` to `pkg/machine/define` 

Moves the `DefaultMachineName` constant out of `pkg/machine` and into
`pkg/machine/define`.

Signed-off-by: Jake Correnti <jakecorrenti+github@proton.me>
This commit is contained in:
Jake Correnti 2024-09-24 15:33:33 -04:00
parent e041f2a7b7
commit 9febd2c27a
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/machine/init.go
View File

@ -11,7 +11,6 @@ import (
"github.com/containers/podman/v5/cmd/podman/registry"
ldefine "github.com/containers/podman/v5/libpod/define"
"github.com/containers/podman/v5/libpod/events"
"github.com/containers/podman/v5/pkg/machine"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/shim"
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
@ -34,7 +33,7 @@ var (
initOpts = define.InitOptions{}
initOptionalFlags = InitOptionalFlags{}
defaultMachineName = machine.DefaultMachineName
defaultMachineName = define.DefaultMachineName
now bool
)

4
cmd/podman/machine/os/manager.go
View File

@ -9,7 +9,7 @@ import (
"strings"
machineconfig "github.com/containers/common/pkg/machine"
pkgMachine "github.com/containers/podman/v5/pkg/machine"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/env"
pkgOS "github.com/containers/podman/v5/pkg/machine/os"
"github.com/containers/podman/v5/pkg/machine/provider"
@ -47,7 +47,7 @@ func guestOSManager() (pkgOS.Manager, error) {
func machineOSManager(opts ManagerOpts, _ vmconfigs.VMProvider) (pkgOS.Manager, error) {
vmName := opts.VMName
if opts.VMName == "" {
vmName = pkgMachine.DefaultMachineName
vmName = define.DefaultMachineName
}
p, err := provider.Get()
if err != nil {

5
pkg/machine/config.go
View File

@ -20,10 +20,7 @@ import (
"github.com/sirupsen/logrus"
)
const (
DefaultMachineName string = "podman-machine-default"
apiUpTimeout = 20 * time.Second
)
const apiUpTimeout = 20 * time.Second
var (
ForwarderBinaryName = "gvproxy"

7
pkg/machine/define/config.go
View File

@ -2,8 +2,11 @@ package define
import "os"
const UserCertsTargetPath = "/etc/containers/certs.d"
const DefaultIdentityName = "machine"
const (
UserCertsTargetPath = "/etc/containers/certs.d"
DefaultIdentityName = "machine"
DefaultMachineName = "podman-machine-default"
)
// MountTag is an identifier to mount a VirtioFS file system tag on a mount point in the VM.
// Ref: https://developer.apple.com/documentation/virtualization/running_intel_binaries_in_linux_vms_with_rosetta

5
pkg/machine/machine_common.go
View File

@ -9,6 +9,7 @@ import (
"strings"
"github.com/containers/podman/v5/pkg/machine/connection"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/storage/pkg/ioutils"
)
@ -36,7 +37,7 @@ func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardS
suffix := ""
var fmtString string
if name != DefaultMachineName {
if name != define.DefaultMachineName {
suffix = " " + name
}
@ -95,7 +96,7 @@ following command in your terminal session:
func PrintRootlessWarning(name string) {
suffix := ""
if name != DefaultMachineName {
if name != define.DefaultMachineName {
suffix = " " + name
}