6 files changed, 40 insertions, 21 deletions
diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go
index 290b3c245..ee237d7d0 100644
--- a/cmd/podman/system/connection/add.go
+++ b/cmd/podman/system/connection/add.go
@@ -226,12 +226,7 @@ func getUDS(cmd *cobra.Command, uri *url.URL, iden string) (string, error) {
 	if v, found := os.LookupEnv("PODMAN_BINARY"); found {
 		podman = v
 	}
-	run := podman + " info --format=json"
-	out, err := ExecRemoteCommand(dial, run)
-	if err != nil {
-		return "", err
-	}
-	infoJSON, err := json.Marshal(out)
+	infoJSON, err := ExecRemoteCommand(dial, podman+" info --format=json")
 	if err != nil {
 		return "", err
 	}
diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go
index a3290e3d6..f1f7657ad 100644
--- a/cmd/podman/system/connection/list.go
+++ b/cmd/podman/system/connection/list.go
@@ -53,10 +53,6 @@ func list(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	if len(cfg.Engine.ServiceDestinations) == 0 {
-		return nil
-	}
-
 	hdrs := []map[string]string{{
 		"Identity": "Identity",
 		"Name":     "Name",
diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go
index 73bae4994..ffbea76c5 100644
--- a/cmd/podman/system/connection/remove.go
+++ b/cmd/podman/system/connection/remove.go
@@ -5,14 +5,14 @@ import (
 	"github.com/containers/podman/v3/cmd/podman/common"
 	"github.com/containers/podman/v3/cmd/podman/registry"
 	"github.com/containers/podman/v3/cmd/podman/system"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
 var (
 	// Skip creating engines since this command will obtain connection information to said engines
 	rmCmd = &cobra.Command{
-		Use:               "remove NAME",
-		Args:              cobra.ExactArgs(1),
+		Use:               "remove [options] NAME",
 		Aliases:           []string{"rm"},
 		Long:              `Delete named destination from podman configuration`,
 		Short:             "Delete named destination",
@@ -21,6 +21,10 @@ var (
 		Example: `podman system connection remove devl
   podman system connection rm devl`,
 	}
+
+	rmOpts = struct {
+		All bool
+	}{}
 )
 
 func init() {
@@ -28,14 +32,31 @@ func init() {
 		Command: rmCmd,
 		Parent:  system.ConnectionCmd,
 	})
+
+	flags := rmCmd.Flags()
+	flags.BoolVarP(&rmOpts.All, "all", "a", false, "Remove all connections")
 }
 
-func rm(_ *cobra.Command, args []string) error {
+func rm(cmd *cobra.Command, args []string) error {
 	cfg, err := config.ReadCustomConfig()
 	if err != nil {
 		return err
 	}
 
+	if rmOpts.All {
+		if cfg.Engine.ServiceDestinations != nil {
+			for k := range cfg.Engine.ServiceDestinations {
+				delete(cfg.Engine.ServiceDestinations, k)
+			}
+		}
+		cfg.Engine.ActiveService = ""
+		return cfg.Write()
+	}
+
+	if len(args) != 1 {
+		return errors.New("accepts 1 arg(s), received 0")
+	}
+
 	if cfg.Engine.ServiceDestinations != nil {
 		delete(cfg.Engine.ServiceDestinations, args[0])
 	}
diff --git a/cmd/podman/system/connection/shared.go b/cmd/podman/system/connection/shared.go
index 3fd7c59fb..714ae827d 100644
--- a/cmd/podman/system/connection/shared.go
+++ b/cmd/podman/system/connection/shared.go
@@ -9,10 +9,10 @@ import (
 
 // ExecRemoteCommand takes a ssh client connection and a command to run and executes the
 // command on the specified client. The function returns the Stdout from the client or the Stderr
-func ExecRemoteCommand(dial *ssh.Client, run string) (string, error) {
+func ExecRemoteCommand(dial *ssh.Client, run string) ([]byte, error) {
 	sess, err := dial.NewSession() // new ssh client session
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	defer sess.Close()
 
@@ -21,8 +21,7 @@ func ExecRemoteCommand(dial *ssh.Client, run string) (string, error) {
 	sess.Stdout = &buffer                 // output from client funneled into buffer
 	sess.Stderr = &bufferErr              // err form client funneled into buffer
 	if err := sess.Run(run); err != nil { // run the command on the ssh client
-		return "", errors.Wrapf(err, bufferErr.String())
+		return nil, errors.Wrapf(err, bufferErr.String())
 	}
-	out := buffer.String() // output from command
-	return out, nil
+	return buffer.Bytes(), nil
 }
diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go
index 50230609e..9b777dd8f 100644
--- a/cmd/podman/system/unshare.go
+++ b/cmd/podman/system/unshare.go
@@ -10,6 +10,7 @@ import (
 	"github.com/containers/podman/v3/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var (
@@ -34,7 +35,14 @@ func init() {
 	})
 	flags := unshareCommand.Flags()
 	flags.SetInterspersed(false)
-	flags.BoolVar(&unshareOptions.RootlessCNI, "rootless-cni", false, "Join the rootless network namespace used for CNI networking")
+	flags.BoolVar(&unshareOptions.RootlessNetNS, "rootless-netns", false, "Join the rootless network namespace used for CNI and netavark networking")
+	// backwards compat still allow --rootless-cni
+	flags.SetNormalizeFunc(func(f *pflag.FlagSet, name string) pflag.NormalizedName {
+		if name == "rootless-cni" {
+			name = "rootless-netns"
+		}
+		return pflag.NormalizedName(name)
+	})
 }
 
 func unshare(cmd *cobra.Command, args []string) error {
diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
index 4502b156c..3443978d6 100644
--- a/cmd/podman/system/version.go
+++ b/cmd/podman/system/version.go
@@ -20,7 +20,7 @@ var (
 	versionCommand = &cobra.Command{
 		Use:               "version [options]",
 		Args:              validate.NoArgs,
-		Short:             "Display the Podman Version Information",
+		Short:             "Display the Podman version information",
 		RunE:              version,
 		ValidArgsFunction: completion.AutocompleteNone,
 	}
@@ -67,7 +67,7 @@ func version(cmd *cobra.Command, args []string) error {
 		}
 		if err := tmpl.Execute(w, versions); err != nil {
 			// On Failure, assume user is using older version of podman version --format and check client
-			row = strings.Replace(row, ".Server.", ".", 1)
+			row = strings.ReplaceAll(row, ".Server.", ".")
 			tmpl, err := report.NewTemplate("version 1.0.0").Parse(row)
 			if err != nil {
 				return err