Merge pull request #5848 from jwhonce/wip/options

V2 Enable rootless

2 files changed, 10 insertions, 22 deletions

diff --git a/cmd/podmanV2/pods/pod.go b/cmd/podmanV2/pods/pod.go
index 81c0d33e1..3434bfc02 100644
--- a/cmd/podmanV2/pods/pod.go
+++ b/cmd/podmanV2/pods/pod.go
@@ -9,12 +9,11 @@ import (
 var (
 	// Command: podman _pod_
 	podCmd = &cobra.Command{
-		Use:               "pod",
-		Short:             "Manage pods",
-		Long:              "Manage pods",
-		TraverseChildren:  true,
-		PersistentPreRunE: preRunE,
-		RunE:              registry.SubCommandExists,
+		Use:              "pod",
+		Short:            "Manage pods",
+		Long:             "Manage pods",
+		TraverseChildren: true,
+		RunE:             registry.SubCommandExists,
 	}
 )
 
@@ -23,11 +22,4 @@ func init() {
 		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: podCmd,
 	})
-	podCmd.SetHelpTemplate(registry.HelpTemplate())
-	podCmd.SetUsageTemplate(registry.UsageTemplate())
-}
-
-func preRunE(cmd *cobra.Command, args []string) error {
-	_, err := registry.NewContainerEngine(cmd, args)
-	return err
 }
diff --git a/cmd/podmanV2/pods/top.go b/cmd/podmanV2/pods/top.go
index 5ef282238..e501bb478 100644
--- a/cmd/podmanV2/pods/top.go
+++ b/cmd/podmanV2/pods/top.go
@@ -24,12 +24,11 @@ var (
 	topOptions = entities.PodTopOptions{}
 
 	topCommand = &cobra.Command{
-		Use:               "top [flags] POD [FORMAT-DESCRIPTORS|ARGS]",
-		Short:             "Display the running processes in a pod",
-		Long:              topDescription,
-		PersistentPreRunE: preRunE,
-		RunE:              top,
-		Args:              cobra.ArbitraryArgs,
+		Use:   "top [flags] POD [FORMAT-DESCRIPTORS|ARGS]",
+		Short: "Display the running processes in a pod",
+		Long:  topDescription,
+		RunE:  top,
+		Args:  cobra.ArbitraryArgs,
 		Example: `podman pod top podID
 podman pod top --latest
 podman pod top podID pid seccomp args %C
@@ -44,9 +43,6 @@ func init() {
 		Parent:  podCmd,
 	})
 
-	topCommand.SetHelpTemplate(registry.HelpTemplate())
-	topCommand.SetUsageTemplate(registry.UsageTemplate())
-
 	flags := topCommand.Flags()
 	flags.SetInterspersed(false)
 	flags.BoolVar(&topOptions.ListDescriptors, "list-descriptors", false, "")