5 files changed, 64 insertions, 23 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index 885f2ac51..1fcb98a0e 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -234,10 +234,6 @@ func buildCmd(c *cliconfig.BuildValues) error {
 				return errors.Wrapf(err, "error determining path to file %q", containerfiles[i])
 			}
 			contextDir = filepath.Dir(absFile)
-			containerfiles[i], err = filepath.Rel(contextDir, absFile)
-			if err != nil {
-				return errors.Wrapf(err, "error determining path to file %q", containerfiles[i])
-			}
 			break
 		}
 	}
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index ebd7aeb0c..d6018a6f4 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -26,9 +26,6 @@ func getMainCommands() []*cobra.Command {
 	if len(_varlinkCommand.Use) > 0 {
 		rootCommands = append(rootCommands, _varlinkCommand)
 	}
-	if len(_serviceCommand.Use) > 0 {
-		rootCommands = append(rootCommands, _serviceCommand)
-	}
 	return rootCommands
 }
 
@@ -71,9 +68,15 @@ func getTrustSubCommands() []*cobra.Command {
 
 // Commands that the local client implements
 func getSystemSubCommands() []*cobra.Command {
-	return []*cobra.Command{
+	systemCommands := []*cobra.Command{
 		_renumberCommand,
 		_dfSystemCommand,
 		_migrateCommand,
 	}
+
+	if len(_serviceCommand.Use) > 0 {
+		systemCommands = append(systemCommands, _serviceCommand)
+	}
+
+	return systemCommands
 }
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
index 9425cfb9c..e9dc87de1 100644
--- a/cmd/podman/libpodruntime/runtime.go
+++ b/cmd/podman/libpodruntime/runtime.go
@@ -13,32 +13,66 @@ import (
 	"github.com/pkg/errors"
 )
 
+type runtimeOptions struct {
+	name     string
+	renumber bool
+	migrate  bool
+	noStore  bool
+	withFDS  bool
+}
+
 // GetRuntimeMigrate gets a libpod runtime that will perform a migration of existing containers
 func GetRuntimeMigrate(ctx context.Context, c *cliconfig.PodmanCommand, newRuntime string) (*libpod.Runtime, error) {
-	return getRuntime(ctx, c, false, true, false, true, newRuntime)
+	return getRuntime(ctx, c, &runtimeOptions{
+		name:     newRuntime,
+		renumber: false,
+		migrate:  true,
+		noStore:  false,
+		withFDS:  true,
+	})
 }
 
 // GetRuntimeDisableFDs gets a libpod runtime that will disable sd notify
 func GetRuntimeDisableFDs(ctx context.Context, c *cliconfig.PodmanCommand) (*libpod.Runtime, error) {
-	return getRuntime(ctx, c, false, false, false, false, "")
+	return getRuntime(ctx, c, &runtimeOptions{
+		renumber: false,
+		migrate:  false,
+		noStore:  false,
+		withFDS:  false,
+	})
 }
 
 // GetRuntimeRenumber gets a libpod runtime that will perform a lock renumber
 func GetRuntimeRenumber(ctx context.Context, c *cliconfig.PodmanCommand) (*libpod.Runtime, error) {
-	return getRuntime(ctx, c, true, false, false, true, "")
+	return getRuntime(ctx, c, &runtimeOptions{
+		renumber: true,
+		migrate:  false,
+		noStore:  false,
+		withFDS:  true,
+	})
 }
 
 // GetRuntime generates a new libpod runtime configured by command line options
 func GetRuntime(ctx context.Context, c *cliconfig.PodmanCommand) (*libpod.Runtime, error) {
-	return getRuntime(ctx, c, false, false, false, true, "")
+	return getRuntime(ctx, c, &runtimeOptions{
+		renumber: false,
+		migrate:  false,
+		noStore:  false,
+		withFDS:  true,
+	})
 }
 
 // GetRuntimeNoStore generates a new libpod runtime configured by command line options
 func GetRuntimeNoStore(ctx context.Context, c *cliconfig.PodmanCommand) (*libpod.Runtime, error) {
-	return getRuntime(ctx, c, false, false, true, true, "")
+	return getRuntime(ctx, c, &runtimeOptions{
+		renumber: false,
+		migrate:  false,
+		noStore:  true,
+		withFDS:  true,
+	})
 }
 
-func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber, migrate, noStore, withFDS bool, newRuntime string) (*libpod.Runtime, error) {
+func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, opts *runtimeOptions) (*libpod.Runtime, error) {
 	options := []libpod.RuntimeOption{}
 	storageOpts := storage.StoreOptions{}
 	storageSet := false
@@ -86,14 +120,14 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber, migra
 		storageSet = true
 		storageOpts.GraphDriverOptions = c.GlobalFlags.StorageOpts
 	}
-	if migrate {
+	if opts.migrate {
 		options = append(options, libpod.WithMigrate())
-		if newRuntime != "" {
-			options = append(options, libpod.WithMigrateRuntime(newRuntime))
+		if opts.name != "" {
+			options = append(options, libpod.WithMigrateRuntime(opts.name))
 		}
 	}
 
-	if renumber {
+	if opts.renumber {
 		options = append(options, libpod.WithRenumber())
 	}
 
@@ -102,7 +136,7 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber, migra
 		options = append(options, libpod.WithStorageConfig(storageOpts))
 	}
 
-	if !storageSet && noStore {
+	if !storageSet && opts.noStore {
 		options = append(options, libpod.WithNoStore())
 	}
 	// TODO CLI flags for image config?
@@ -174,7 +208,7 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber, migra
 		options = append(options, libpod.WithDefaultInfraCommand(infraCommand))
 	}
 
-	if !withFDS {
+	if !opts.withFDS {
 		options = append(options, libpod.WithEnableSDNotify())
 	}
 	if c.Flags().Changed("config") {
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index d2c5e19e2..d93ccc24c 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -205,6 +205,10 @@ func checkFlagsPassed(c *cliconfig.PsValues) error {
 	if c.Last >= 0 && c.Latest {
 		return errors.Errorf("last and latest are mutually exclusive")
 	}
+	// Filter forces all
+	if len(c.Filter) > 0 {
+		c.All = true
+	}
 	// Quiet conflicts with size and namespace and is overridden by a Go
 	// template.
 	if c.Quiet {
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 2f637694b..010c80373 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -309,9 +309,13 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
 		}
 	}
 	if c.String("memory-swap") != "" {
-		memorySwap, err = units.RAMInBytes(c.String("memory-swap"))
-		if err != nil {
-			return nil, errors.Wrapf(err, "invalid value for memory-swap")
+		if c.String("memory-swap") == "-1" {
+			memorySwap = -1
+		} else {
+			memorySwap, err = units.RAMInBytes(c.String("memory-swap"))
+			if err != nil {
+				return nil, errors.Wrapf(err, "invalid value for memory-swap")
+			}
 		}
 	}
 	if c.String("kernel-memory") != "" {