Merge pull request #23145 from afbjorklund/remove-machine-volume-driver

Remove the unused machine volume-driver

cmd/podman/machine/init.go

@@ -126,8 +126,11 @@ func init() {
 	_ = initCmd.RegisterFlagCompletionFunc(USBFlagName, completion.AutocompleteDefault)
 
 	VolumeDriverFlagName := "volume-driver"
-	flags.StringVar(&initOpts.VolumeDriver, VolumeDriverFlagName, "", "Optional volume driver")
+	flags.String(VolumeDriverFlagName, "", "Optional volume driver")
 	_ = initCmd.RegisterFlagCompletionFunc(VolumeDriverFlagName, completion.AutocompleteDefault)
+	if err := flags.MarkDeprecated(VolumeDriverFlagName, "will be ignored"); err != nil {
+		logrus.Error("unable to mark volume-driver flag deprecated")
+	}
 
 	IgnitionPathFlagName := "ignition-path"
 	flags.StringVar(&initOpts.IgnitionPath, IgnitionPathFlagName, "", "Path to ignition file")

docs/source/markdown/podman-machine-init.1.md.in

@@ -160,10 +160,6 @@ Example: `-v "$HOME/git:$HOME/git:ro,security_model=none"`
 Default volume mounts are defined in *containers.conf*.  Unless changed, the default values
 is `$HOME:$HOME`.
 
-#### **--volume-driver**
-
-Driver to use for mounting volumes from the host, such as `virtfs`.
-
 ## EXAMPLES
 
 Initialize the default Podman machine, pulling the content from the internet.

pkg/machine/define/initopts.go

@@ -8,7 +8,6 @@ type InitOptions struct {
 	IgnitionPath       string
 	Image              string
 	Volumes            []string
-	VolumeDriver       string
 	IsDefault          bool
 	Memory             uint64
 	Name               string