summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-04-15 06:10:17 -0400
committerGitHub <noreply@github.com>2022-04-15 06:10:17 -0400
commit25eeaec219ccc49dcb35e098afaed7d7987cbee1 (patch)
tree6ef9572c7d42ab71db7a0795ad94056af2b6e2d2 /cmd
parent92625eadc600c22897b8c6b2955eacc27a045f84 (diff)
parent900739d134564f48bd91a159a25fac52b608bbf4 (diff)
downloadpodman-25eeaec219ccc49dcb35e098afaed7d7987cbee1.tar.gz
podman-25eeaec219ccc49dcb35e098afaed7d7987cbee1.tar.bz2
podman-25eeaec219ccc49dcb35e098afaed7d7987cbee1.zip
Merge pull request #13849 from baude/defaultvolumess
Mount $HOME:$HOME by default in podman machine init
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/machine/init.go10
1 files changed, 7 insertions, 3 deletions
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go
index 518e7490f..2d0afbf05 100644
--- a/cmd/podman/machine/init.go
+++ b/cmd/podman/machine/init.go
@@ -5,6 +5,7 @@ package machine
import (
"fmt"
+ "os"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v4/cmd/podman/registry"
@@ -94,7 +95,7 @@ func init() {
_ = initCmd.RegisterFlagCompletionFunc(ImagePathFlagName, completion.AutocompleteDefault)
VolumeFlagName := "volume"
- flags.StringArrayVarP(&initOpts.Volumes, VolumeFlagName, "v", []string{}, "Volumes to mount, source:target")
+ flags.StringArrayVarP(&initOpts.Volumes, VolumeFlagName, "v", cfg.Machine.Volumes, "Volumes to mount, source:target")
_ = initCmd.RegisterFlagCompletionFunc(VolumeFlagName, completion.AutocompleteDefault)
VolumeDriverFlagName := "volume-driver"
@@ -112,9 +113,10 @@ func init() {
// TODO should we allow for a users to append to the qemu cmdline?
func initMachine(cmd *cobra.Command, args []string) error {
var (
- vm machine.VM
err error
+ vm machine.VM
)
+
provider := getSystemDefaultProvider()
initOpts.Name = defaultMachineName
if len(args) > 0 {
@@ -126,7 +128,9 @@ func initMachine(cmd *cobra.Command, args []string) error {
if _, err := provider.LoadVMByName(initOpts.Name); err == nil {
return errors.Wrap(machine.ErrVMAlreadyExists, initOpts.Name)
}
-
+ for idx, vol := range initOpts.Volumes {
+ initOpts.Volumes[idx] = os.ExpandEnv(vol)
+ }
vm, err = provider.NewMachine(initOpts)
if err != nil {
return err