diff options
| author | Jake Correnti <jakecorrenti+github@proton.me> | 2024-09-24 15:33:33 -0400 |
|---|---|---|
| committer | Jake Correnti <jakecorrenti+github@proton.me> | 2024-09-24 15:36:14 -0400 |
| commit | 9febd2c27ad6708f1b49326ab00758e499a66617 (patch) | |
| tree | 6ffafc19f6c203f56e424584ffb26d4ce2fa3b0b /cmd | |
| parent | e041f2a7b781ed93e18ef3db69eec4aeca50c18f (diff) | |
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>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/machine/init.go | 3 | ||||
| -rw-r--r-- | cmd/podman/machine/os/manager.go | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index 6f0579a97..69afdc02c 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -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 ) diff --git a/cmd/podman/machine/os/manager.go b/cmd/podman/machine/os/manager.go index 1e028be23..234246cf1 100644 --- a/cmd/podman/machine/os/manager.go +++ b/cmd/podman/machine/os/manager.go @@ -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 { |