podman-mount* flag should be used only on server installation

uyuni-project · Apr 17, 2024 · fd53a3e · fd53a3e
1 parent 1c27fac
commit fd53a3e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/mgradm/cmd/migrate/podman/podman.go b/mgradm/cmd/migrate/podman/podman.go
@@ -41,7 +41,7 @@ NOTE: migrating to a remote podman is not supported yet!
 	}
 
 	shared.AddMigrateFlags(migrateCmd)
-	podman_utils.AddPodmanInstallFlag(migrateCmd)
+	podman_utils.AddPodmanArgFlag(migrateCmd)
 
 	return migrateCmd
 }
diff --git a/mgradm/cmd/upgrade/podman/podman.go b/mgradm/cmd/upgrade/podman/podman.go
@@ -53,7 +53,7 @@ func NewCommand(globalFlags *types.GlobalFlags) *cobra.Command {
 	upgradeCmd.AddCommand(listCmd)
 
 	shared.AddUpgradeFlags(upgradeCmd)
-	podman.AddPodmanInstallFlag(upgradeCmd)
+	podman.AddPodmanArgFlag(upgradeCmd)
 
 	return upgradeCmd
 }
diff --git a/mgrpxy/cmd/install/podman/podman.go b/mgrpxy/cmd/install/podman/podman.go
@@ -40,7 +40,7 @@ NOTE: for now installing on a remote podman is not supported!
 	}
 
 	utils.AddInstallFlags(podmanCmd)
-	podman.AddPodmanInstallFlag(podmanCmd)
+	podman.AddPodmanArgFlag(podmanCmd)
 
 	return podmanCmd
 }
diff --git a/shared/podman/utils.go b/shared/podman/utils.go
@@ -42,10 +42,14 @@ type PodmanMountFlags struct {
 	Spacewalk  string
 }
 
-// AddPodmanInstallFlag add the podman arguments to a command.
-func AddPodmanInstallFlag(cmd *cobra.Command) {
+// AddPodmanArgFlag add the podman arguments to a command.
+func AddPodmanArgFlag(cmd *cobra.Command) {
 	cmd.Flags().StringSlice("podman-arg", []string{}, L("Extra arguments to pass to podman"))
+}
 
+// AddPodmanInstallFlag add the podman install arguments to a command.
+func AddPodmanInstallFlag(cmd *cobra.Command) {
+	AddPodmanArgFlag(cmd)
 	cmd.Flags().String("podman-mount-cache", "", L("Path to custom /var/cache volume"))
 	cmd.Flags().String("podman-mount-postgresql", "", L("Path to custom /var/lib/pgsql volume"))
 	cmd.Flags().String("podman-mount-spacewalk", "", L("Path to custom /var/spacewalk volume"))

diff --git a/uyuni-tools.changes.mbussolotto.path_volume_flag b/uyuni-tools.changes.mbussolotto.path_volume_flag
@@ -0,0 +1 @@
+- podman-mount* flag should be used only on server installation
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- podman-mount* flag should be used only on server installation