Merge pull request #5848 from jwhonce/wip/options

V2 Enable rootless

5 files changed, 22 insertions, 34 deletions

diff --git a/cmd/podmanV2/system/events.go b/cmd/podmanV2/system/events.go
index 9fd27e2c1..95e6a5576 100644
--- a/cmd/podmanV2/system/events.go
+++ b/cmd/podmanV2/system/events.go
@@ -17,12 +17,11 @@ import (
 var (
 	eventsDescription = "Monitor podman events"
 	eventsCommand     = &cobra.Command{
-		Use:               "events",
-		Args:              cobra.NoArgs,
-		Short:             "Show podman events",
-		Long:              eventsDescription,
-		PersistentPreRunE: preRunE,
-		RunE:              eventsCmd,
+		Use:   "events",
+		Args:  cobra.NoArgs,
+		Short: "Show podman events",
+		Long:  eventsDescription,
+		RunE:  eventsCmd,
 		Example: `podman events
   podman events --filter event=create
   podman events --since 1h30s`,
diff --git a/cmd/podmanV2/system/info.go b/cmd/podmanV2/system/info.go
index 69b2871b7..6b0c6a13b 100644
--- a/cmd/podmanV2/system/info.go
+++ b/cmd/podmanV2/system/info.go
@@ -22,7 +22,6 @@ var (
 		Args:    cobra.NoArgs,
 		Long:    infoDescription,
 		Short:   "Display podman system information",
-		PreRunE: preRunE,
 		RunE:    info,
 		Example: `podman info`,
 	}
diff --git a/cmd/podmanV2/system/system.go b/cmd/podmanV2/system/system.go
index b44632187..e62a0c150 100644
--- a/cmd/podmanV2/system/system.go
+++ b/cmd/podmanV2/system/system.go
@@ -9,12 +9,11 @@ import (
 var (
 	// Command: podman _system_
 	systemCmd = &cobra.Command{
-		Use:               "system",
-		Short:             "Manage podman",
-		Long:              "Manage podman",
-		TraverseChildren:  true,
-		PersistentPreRunE: preRunE,
-		RunE:              registry.SubCommandExists,
+		Use:              "system",
+		Short:            "Manage podman",
+		Long:             "Manage podman",
+		TraverseChildren: true,
+		RunE:             registry.SubCommandExists,
 	}
 )
 
@@ -23,11 +22,4 @@ func init() {
 		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: systemCmd,
 	})
-	systemCmd.SetHelpTemplate(registry.HelpTemplate())
-	systemCmd.SetUsageTemplate(registry.UsageTemplate())
-}
-
-func preRunE(cmd *cobra.Command, args []string) error {
-	_, err := registry.NewContainerEngine(cmd, args)
-	return err
 }
diff --git a/cmd/podmanV2/system/varlink.go b/cmd/podmanV2/system/varlink.go
index da9af6fe4..27dd0a7e9 100644
--- a/cmd/podmanV2/system/varlink.go
+++ b/cmd/podmanV2/system/varlink.go
@@ -14,12 +14,11 @@ var (
   Tools speaking varlink protocol can remotely manage pods, containers and images.
 `
 	varlinkCmd = &cobra.Command{
-		Use:     "varlink [flags] [URI]",
-		Args:    cobra.MinimumNArgs(1),
-		Short:   "Run varlink interface",
-		Long:    varlinkDescription,
-		PreRunE: preRunE,
-		RunE:    varlinkE,
+		Use:   "varlink [flags] [URI]",
+		Args:  cobra.MinimumNArgs(1),
+		Short: "Run varlink interface",
+		Long:  varlinkDescription,
+		RunE:  varlinkE,
 		Example: `podman varlink unix:/run/podman/io.podman
   podman varlink --timeout 5000 unix:/run/podman/io.podman`,
 	}
@@ -33,9 +32,6 @@ func init() {
 		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: varlinkCmd,
 	})
-	varlinkCmd.SetHelpTemplate(registry.HelpTemplate())
-	varlinkCmd.SetUsageTemplate(registry.UsageTemplate())
-
 	flags := varlinkCmd.Flags()
 	flags.Int64VarP(&varlinkArgs.Timeout, "time", "t", 1000, "Time until the varlink session expires in milliseconds.  Use 0 to disable the timeout")
 	flags.Int64Var(&varlinkArgs.Timeout, "timeout", 1000, "Time until the varlink session expires in milliseconds.  Use 0 to disable the timeout")
diff --git a/cmd/podmanV2/system/version.go b/cmd/podmanV2/system/version.go
index 8d6e8b7a8..7004c3109 100644
--- a/cmd/podmanV2/system/version.go
+++ b/cmd/podmanV2/system/version.go
@@ -18,11 +18,13 @@ import (
 
 var (
 	versionCommand = &cobra.Command{
-		Use:               "version",
-		Args:              cobra.NoArgs,
-		Short:             "Display the Podman Version Information",
-		RunE:              version,
-		PersistentPreRunE: preRunE,
+		Use:   "version",
+		Args:  cobra.NoArgs,
+		Short: "Display the Podman Version Information",
+		RunE:  version,
+		Annotations: map[string]string{
+			registry.ParentNSRequired: "",
+		},
 	}
 	versionFormat string
 )