1 files changed, 23 insertions, 44 deletions
diff --git a/cmd/podman/umount.go b/cmd/podman/umount.go
index 24f0f178b..42f169228 100644
--- a/cmd/podman/umount.go
+++ b/cmd/podman/umount.go
@@ -21,6 +21,7 @@ var (
 			Name:  "force, f",
 			Usage: "force the complete umount all of the currently mounted containers",
 		},
+		LatestFlag,
 	}
 
 	description = `
@@ -33,7 +34,7 @@ An unmount can be forced with the --force flag.
 	umountCommand = cli.Command{
 		Name:         "umount",
 		Aliases:      []string{"unmount"},
-		Usage:        "Unmounts working container's root filesystem",
+		Usage:        "Unmount working container's root filesystem",
 		Description:  description,
 		Flags:        sortFlags(umountFlags),
 		Action:       umountCmd,
@@ -51,59 +52,37 @@ func umountCmd(c *cli.Context) error {
 
 	force := c.Bool("force")
 	umountAll := c.Bool("all")
-	args := c.Args()
-	if len(args) == 0 && !umountAll {
-		return errors.Errorf("container ID must be specified")
+	if err := checkAllAndLatest(c); err != nil {
+		return err
 	}
-	if len(args) > 0 && umountAll {
-		return errors.Errorf("when using the --all switch, you may not pass any container IDs")
+
+	containers, err := getAllOrLatestContainers(c, runtime, -1, "all")
+	if err != nil {
+		if len(containers) == 0 {
+			return err
+		}
+		fmt.Println(err.Error())
 	}
 
 	umountContainerErrStr := "error unmounting container"
 	var lastError error
-	if len(args) > 0 {
-		for _, name := range args {
-			ctr, err := runtime.LookupContainer(name)
-			if err != nil {
-				if lastError != nil {
-					logrus.Error(lastError)
-				}
-				lastError = errors.Wrapf(err, "%s %s", umountContainerErrStr, name)
-				continue
-			}
-
-			if err = ctr.Unmount(force); err != nil {
-				if lastError != nil {
-					logrus.Error(lastError)
-				}
-				lastError = errors.Wrapf(err, "%s %s", umountContainerErrStr, name)
-				continue
-			}
-			fmt.Printf("%s\n", ctr.ID())
-		}
-	} else {
-		containers, err := runtime.GetContainers()
-		if err != nil {
-			return errors.Wrapf(err, "error reading Containers")
+	for _, ctr := range containers {
+		ctrState, err := ctr.State()
+		if ctrState == libpod.ContainerStateRunning || err != nil {
+			continue
 		}
-		for _, ctr := range containers {
-			ctrState, err := ctr.State()
-			if ctrState == libpod.ContainerStateRunning || err != nil {
-				continue
-			}
 
-			if err = ctr.Unmount(force); err != nil {
-				if umountAll && errors.Cause(err) == storage.ErrLayerNotMounted {
-					continue
-				}
-				if lastError != nil {
-					logrus.Error(lastError)
-				}
-				lastError = errors.Wrapf(err, "%s %s", umountContainerErrStr, ctr.ID())
+		if err = ctr.Unmount(force); err != nil {
+			if umountAll && errors.Cause(err) == storage.ErrLayerNotMounted {
 				continue
 			}
-			fmt.Printf("%s\n", ctr.ID())
+			if lastError != nil {
+				logrus.Error(lastError)
+			}
+			lastError = errors.Wrapf(err, "%s %s", umountContainerErrStr, ctr.ID())
+			continue
 		}
+		fmt.Printf("%s\n", ctr.ID())
 	}
 	return lastError
 }