2 files changed, 40 insertions, 32 deletions

diff --git a/cmd/podman/shared/intermediate_varlink.go b/cmd/podman/shared/intermediate_varlink.go
index 95a0d6287..d62a65955 100644
--- a/cmd/podman/shared/intermediate_varlink.go
+++ b/cmd/podman/shared/intermediate_varlink.go
@@ -4,8 +4,10 @@ package shared
 
 import (
 	"fmt"
+
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/varlink"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/pkg/errors"
 )
 
@@ -318,6 +320,12 @@ func VarlinkCreateToGeneric(opts iopodman.Create) GenericCLIResults {
 	// We do not get a default network over varlink. Unlike the other default values for some cli
 	// elements, it seems it gets set to the default anyway.
 
+	var memSwapDefault int64 = -1
+	netModeDefault := "bridge"
+	if rootless.IsRootless() {
+		netModeDefault = "slirp4netns"
+	}
+
 	m := make(map[string]GenericCLIResult)
 	m["add-host"] = stringSliceFromVarlink(opts.AddHost, "add-host", nil)
 	m["annotation"] = stringSliceFromVarlink(opts.Annotation, "annotation", nil)
@@ -374,10 +382,10 @@ func VarlinkCreateToGeneric(opts iopodman.Create) GenericCLIResults {
 	m["memory"] = stringFromVarlink(opts.Memory, "memory", nil)
 	m["memory-reservation"] = stringFromVarlink(opts.MemoryReservation, "memory-reservation", nil)
 	m["memory-swap"] = stringFromVarlink(opts.MemorySwap, "memory-swap", nil)
-	m["memory-swappiness"] = int64FromVarlink(opts.MemorySwappiness, "memory-swappiness", nil)
+	m["memory-swappiness"] = int64FromVarlink(opts.MemorySwappiness, "memory-swappiness", &memSwapDefault)
 	m["name"] = stringFromVarlink(opts.Name, "name", nil)
-	m["net"] = stringFromVarlink(opts.Net, "net", nil)
-	m["network"] = stringFromVarlink(opts.Network, "network", nil)
+	m["net"] = stringFromVarlink(opts.Net, "net", &netModeDefault)
+	m["network"] = stringFromVarlink(opts.Network, "network", &netModeDefault)
 	m["no-hosts"] = boolFromVarlink(opts.NoHosts, "no-hosts", false)
 	m["oom-kill-disable"] = boolFromVarlink(opts.OomKillDisable, "oon-kill-disable", false)
 	m["oom-score-adj"] = intFromVarlink(opts.OomScoreAdj, "oom-score-adj", nil)
diff --git a/cmd/podman/shared/pod.go b/cmd/podman/shared/pod.go
index 4d936d61c..3f4cb0312 100644
--- a/cmd/podman/shared/pod.go
+++ b/cmd/podman/shared/pod.go
@@ -10,12 +10,12 @@ import (
 )
 
 const (
-	stopped = "Stopped"
-	running = "Running"
-	paused  = "Paused"
-	exited  = "Exited"
-	errored = "Error"
-	created = "Created"
+	PodStateStopped = "Stopped"
+	PodStateRunning = "Running"
+	PodStatePaused  = "Paused"
+	PodStateExited  = "Exited"
+	PodStateErrored = "Error"
+	PodStateCreated = "Created"
 )
 
 // GetPodStatus determines the status of the pod based on the
@@ -24,7 +24,7 @@ const (
 func GetPodStatus(pod *libpod.Pod) (string, error) {
 	ctrStatuses, err := pod.Status()
 	if err != nil {
-		return errored, err
+		return PodStateErrored, err
 	}
 	return CreatePodStatusResults(ctrStatuses)
 }
@@ -32,44 +32,44 @@ func GetPodStatus(pod *libpod.Pod) (string, error) {
 func CreatePodStatusResults(ctrStatuses map[string]libpod.ContainerStatus) (string, error) {
 	ctrNum := len(ctrStatuses)
 	if ctrNum == 0 {
-		return created, nil
+		return PodStateCreated, nil
 	}
 	statuses := map[string]int{
-		stopped: 0,
-		running: 0,
-		paused:  0,
-		created: 0,
-		errored: 0,
+		PodStateStopped: 0,
+		PodStateRunning: 0,
+		PodStatePaused:  0,
+		PodStateCreated: 0,
+		PodStateErrored: 0,
 	}
 	for _, ctrStatus := range ctrStatuses {
 		switch ctrStatus {
 		case libpod.ContainerStateExited:
 			fallthrough
 		case libpod.ContainerStateStopped:
-			statuses[stopped]++
+			statuses[PodStateStopped]++
 		case libpod.ContainerStateRunning:
-			statuses[running]++
+			statuses[PodStateRunning]++
 		case libpod.ContainerStatePaused:
-			statuses[paused]++
+			statuses[PodStatePaused]++
 		case libpod.ContainerStateCreated, libpod.ContainerStateConfigured:
-			statuses[created]++
+			statuses[PodStateCreated]++
 		default:
-			statuses[errored]++
+			statuses[PodStateErrored]++
 		}
 	}
 
-	if statuses[running] > 0 {
-		return running, nil
-	} else if statuses[paused] == ctrNum {
-		return paused, nil
-	} else if statuses[stopped] == ctrNum {
-		return exited, nil
-	} else if statuses[stopped] > 0 {
-		return stopped, nil
-	} else if statuses[errored] > 0 {
-		return errored, nil
+	if statuses[PodStateRunning] > 0 {
+		return PodStateRunning, nil
+	} else if statuses[PodStatePaused] == ctrNum {
+		return PodStatePaused, nil
+	} else if statuses[PodStateStopped] == ctrNum {
+		return PodStateExited, nil
+	} else if statuses[PodStateStopped] > 0 {
+		return PodStateStopped, nil
+	} else if statuses[PodStateErrored] > 0 {
+		return PodStateErrored, nil
 	}
-	return created, nil
+	return PodStateCreated, nil
 }
 
 // GetNamespaceOptions transforms a slice of kernel namespaces