From cc3bf66666cb0d2c8937b1a60c2be8d3f5a49d04 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sun, 7 Sep 2014 19:30:05 -0500
Subject: Fix mount --move bug.

---
 toys/pending/mount.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'toys/pending/mount.c')

diff --git a/toys/pending/mount.c b/toys/pending/mount.c
index 53b16bc7..4962df3f 100644
--- a/toys/pending/mount.c
+++ b/toys/pending/mount.c
@@ -139,7 +139,11 @@ static void mount_filesystem(char *dev, char *dir, char *type,
   }
 
   // Autodetect bind mount or filesystem type
-  if (!(flags & MS_MOVE) && (!type || !strcmp(type, "auto"))) {
+
+  if (type && !strcmp(type, "auto")) type = 0;
+  if (flags & MS_MOVE) {
+    if (type) error_exit("--move with -t");
+  } else if (!type) {
     struct stat stdev, stdir;
 
     // file on file or dir on dir is a --bind mount.
-- 
cgit v1.2.3