Ahem: add new faq entry to list at top of FAQ.html

[oweals/busybox.git] / util-linux / mount.c

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 098e636636f9f7ee4375d7ed99e4b58771f28825..b059d7094cca787dbebec6701cd942a229b5352d 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -31,7 +31,7 @@
  *              major adjustments to option parsing, and some serious
  *              dieting all around.
  *
- * 1999-11-06  mtab suppport is back - andersee
+ * 1999-11-06  mtab support is back - andersee
  *
  * 2000-01-12   Ben Collins <bcollins@debian.org>, Borrowed utils-linux's
  *              mount to add loop support.
@@ -75,6 +75,7 @@ enum {
        MS_NOATIME = 1024,      /* Do not update access times. */
        MS_NODIRATIME = 2048,   /* Do not update directory access times */
        MS_BIND = 4096,         /* Use the new linux 2.4.x "mount --bind" feature */
+       MS_MOVE = 8192,         /* Use the new linux 2.4.x "mount --move" feature */
 };
 
 
@@ -117,6 +118,7 @@ static const struct mount_options mount_options[] = {
        {"suid", ~MS_NOSUID, 0},
        {"sync", ~0, MS_SYNCHRONOUS},
        {"bind", ~0, MS_BIND},
+       {"move", ~0, MS_MOVE},
        {0, 0, 0}
 };
 
@@ -343,7 +345,7 @@ static void show_mounts(char *onlytype)
                        if (strcmp(blockDevice, "rootfs") == 0) {
                                continue;
                        } else if (strcmp(blockDevice, "/dev/root") == 0) {
-                               blockDevice = find_real_root_device_name(blockDevice);
+                               blockDevice = find_real_root_device_name();
                        }
                        if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) {
                                printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
@@ -402,11 +404,11 @@ extern int mount_main(int argc, char **argv)
                case 'f':
                        fakeIt = TRUE;
                        break;
-#ifdef CONFIG_FEATURE_MTAB_SUPPORT
                case 'n':
+#ifdef CONFIG_FEATURE_MTAB_SUPPORT
                        useMtab = FALSE;
-                       break;
 #endif
+                       break;
                case 'v':
                        break;          /* ignore -v */
                }