3 files changed, 44 insertions, 22 deletions

diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go
index 898d65bd0..cae52ccaa 100644
--- a/cmd/podman/common/netflags.go
+++ b/cmd/podman/common/netflags.go
@@ -59,8 +59,8 @@ func DefineNetFlags(cmd *cobra.Command) {
 	_ = cmd.RegisterFlagCompletionFunc(macAddressFlagName, completion.AutocompleteNone)
 
 	networkFlagName := "network"
-	netFlags.StringArray(
-		networkFlagName, []string{containerConfig.NetNS()},
+	netFlags.String(
+		networkFlagName, containerConfig.NetNS(),
 		"Connect a container to a network",
 	)
 	_ = cmd.RegisterFlagCompletionFunc(networkFlagName, AutocompleteNetworks)
@@ -194,29 +194,25 @@ func NetFlagsToNetOptions(cmd *cobra.Command) (*entities.NetOptions, error) {
 	}
 
 	if cmd.Flags().Changed("network") {
-		networks, err := cmd.Flags().GetStringArray("network")
+		network, err := cmd.Flags().GetString("network")
 		if err != nil {
 			return nil, err
 		}
-		for i, network := range networks {
-			parts := strings.SplitN(network, ":", 2)
 
-			ns, cniNets, err := specgen.ParseNetworkNamespace(network)
-			if err != nil {
-				return nil, err
-			}
-			if i > 0 && (len(cniNets) == 0 || len(opts.CNINetworks) == 0) {
-				return nil, errors.Errorf("network conflict between type %s and %s", opts.Network.NSMode, ns.NSMode)
-			}
+		parts := strings.SplitN(network, ":", 2)
 
-			if len(parts) > 1 {
-				opts.NetworkOptions = make(map[string][]string)
-				opts.NetworkOptions[parts[0]] = strings.Split(parts[1], ",")
-				cniNets = nil
-			}
-			opts.Network = ns
-			opts.CNINetworks = append(opts.CNINetworks, cniNets...)
+		ns, cniNets, err := specgen.ParseNetworkNamespace(network)
+		if err != nil {
+			return nil, err
+		}
+
+		if len(parts) > 1 {
+			opts.NetworkOptions = make(map[string][]string)
+			opts.NetworkOptions[parts[0]] = strings.Split(parts[1], ",")
+			cniNets = nil
 		}
+		opts.Network = ns
+		opts.CNINetworks = cniNets
 	}
 
 	aliases, err := cmd.Flags().GetStringSlice("network-alias")
diff --git a/cmd/podman/common/volumes.go b/cmd/podman/common/volumes.go
index 0468f15e0..dfbb7b1b2 100644
--- a/cmd/podman/common/volumes.go
+++ b/cmd/podman/common/volumes.go
@@ -323,8 +323,8 @@ func getBindMount(args []string) (spec.Mount, error) {
 			if len(kv) == 1 {
 				return newMount, errors.Wrapf(optionArgError, kv[0])
 			}
-			if err := parse.ValidateVolumeHostDir(kv[1]); err != nil {
-				return newMount, err
+			if len(kv[1]) == 0 {
+				return newMount, errors.Wrapf(optionArgError, "host directory cannot be empty")
 			}
 			newMount.Source = kv[1]
 			setSource = true
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index 5b0aa2fe4..d997ea344 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -171,7 +171,33 @@ func create(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-
+	createOptions.Net.Network = specgen.Namespace{}
+	if cmd.Flag("network").Changed {
+		netInput, err := cmd.Flags().GetString("network")
+		if err != nil {
+			return err
+		}
+		parts := strings.SplitN(netInput, ":", 2)
+
+		n := specgen.Namespace{}
+		switch {
+		case netInput == "bridge":
+			n.NSMode = specgen.Bridge
+		case netInput == "host":
+			n.NSMode = specgen.Host
+		case netInput == "slirp4netns", strings.HasPrefix(netInput, "slirp4netns:"):
+			n.NSMode = specgen.Slirp
+			if len(parts) > 1 {
+				createOptions.Net.NetworkOptions = make(map[string][]string)
+				createOptions.Net.NetworkOptions[parts[0]] = strings.Split(parts[1], ",")
+			}
+		default:
+			// Container and NS mode are presently unsupported
+			n.NSMode = specgen.Bridge
+			createOptions.Net.CNINetworks = strings.Split(netInput, ",")
+		}
+		createOptions.Net.Network = n
+	}
 	if len(createOptions.Net.PublishPorts) > 0 {
 		if !createOptions.Infra {
 			return errors.Errorf("you must have an infra container to publish port bindings to the host")