Merge pull request #5800 from baude/v2edtests

Fixes for load and other system tests

1 files changed, 15 insertions, 0 deletions

diff --git a/cmd/podmanV2/pods/create.go b/cmd/podmanV2/pods/create.go
index ab8957ee3..2aaf0cd2c 100644
--- a/cmd/podmanV2/pods/create.go
+++ b/cmd/podmanV2/pods/create.go
@@ -123,6 +123,21 @@ func create(cmd *cobra.Command, args []string) error {
 		}
 	}
 
+	if !createOptions.Infra {
+		if cmd.Flag("infra-command").Changed {
+			return errors.New("cannot set infra-command without an infra container")
+		}
+		createOptions.InfraCommand = ""
+		if cmd.Flag("infra-image").Changed {
+			return errors.New("cannot set infra-image without an infra container")
+		}
+		createOptions.InfraImage = ""
+		if cmd.Flag("share").Changed {
+			return errors.New("cannot set share namespaces without an infra container")
+		}
+		createOptions.Share = nil
+	}
+
 	response, err := registry.ContainerEngine().PodCreate(context.Background(), createOptions)
 	if err != nil {
 		return err