Merge pull request #1 from containers/master

# sync

1 files changed, 9 insertions, 5 deletions

diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index 62b5b849e..51b7a7d52 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -53,6 +53,7 @@ func init() {
 	flags.AddFlagSet(common.GetNetFlags())
 	flags.StringVar(&createOptions.CGroupParent, "cgroup-parent", "", "Set parent cgroup for the pod")
 	flags.BoolVar(&createOptions.Infra, "infra", true, "Create an infra container associated with the pod to share namespaces with")
+	flags.StringVar(&createOptions.InfraConmonPidFile, "infra-conmon-pidfile", "", "Path to the file that will receive the POD of the infra container's conmon")
 	flags.StringVar(&createOptions.InfraImage, "infra-image", containerConfig.Engine.InfraImage, "The image of the infra container to associate with the pod")
 	flags.StringVar(&createOptions.InfraCommand, "infra-command", containerConfig.Engine.InfraCommand, "The command to run on the infra container when the pod is started")
 	flags.StringSliceVar(&labelFile, "label-file", []string{}, "Read in a line delimited file of labels")
@@ -73,8 +74,8 @@ func aliasNetworkFlag(_ *pflag.FlagSet, name string) pflag.NormalizedName {
 
 func create(cmd *cobra.Command, args []string) error {
 	var (
-		err       error
-		podIdFile *os.File
+		err     error
+		podIDFD *os.File
 	)
 	createOptions.Labels, err = parse.GetAllLabels(labelFile, labels)
 	if err != nil {
@@ -83,6 +84,9 @@ func create(cmd *cobra.Command, args []string) error {
 
 	if !createOptions.Infra {
 		logrus.Debugf("Not creating an infra container")
+		if cmd.Flag("infra-conmon-pidfile").Changed {
+			return errors.New("cannot set infra-conmon-pid without an infra container")
+		}
 		if cmd.Flag("infra-command").Changed {
 			return errors.New("cannot set infra-command without an infra container")
 		}
@@ -101,15 +105,15 @@ func create(cmd *cobra.Command, args []string) error {
 	}
 
 	if cmd.Flag("pod-id-file").Changed {
-		podIdFile, err = util.OpenExclusiveFile(podIDFile)
+		podIDFD, err = util.OpenExclusiveFile(podIDFile)
 		if err != nil && os.IsExist(err) {
 			return errors.Errorf("pod id file exists. Ensure another pod is not using it or delete %s", podIDFile)
 		}
 		if err != nil {
 			return errors.Errorf("error opening pod-id-file %s", podIDFile)
 		}
-		defer errorhandling.CloseQuiet(podIdFile)
-		defer errorhandling.SyncQuiet(podIdFile)
+		defer errorhandling.CloseQuiet(podIDFD)
+		defer errorhandling.SyncQuiet(podIDFD)
 	}
 
 	createOptions.Net, err = common.NetFlagsToNetOptions(cmd)