Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/umount.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/umount.c (modified) (3 diffs)

branches/3.2/mindi-busybox/util-linux/umount.c

@@ -8 +8 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//usage:#define umount_trivial_usage
+//usage:       "[OPTIONS] FILESYSTEM|DIRECTORY"
+//usage:#define umount_full_usage "\n\n"
+//usage:       "Unmount file systems\n"
+//usage:    IF_FEATURE_UMOUNT_ALL(
+//usage:     "\n    -a  Unmount all file systems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab")
+//usage:    )
+//usage:    IF_FEATURE_MTAB_SUPPORT(
+//usage:     "\n    -n  Don't erase /etc/mtab entries"
+//usage:    )
+//usage:     "\n    -r  Try to remount devices as read-only if mount is busy"
+//usage:     "\n    -l  Lazy umount (detach filesystem)"
+//usage:     "\n    -f  Force umount (i.e., unreachable NFS server)"
+//usage:    IF_FEATURE_MOUNT_LOOP(
+//usage:     "\n    -D  Don't free loop device even if it has been used"
+//usage:    )
+//usage:
+//usage:#define umount_example_usage
+//usage:       "$ umount /dev/hdc1\n"
+
 #include <mntent.h>
 #include <sys/mount.h>
@@ -24 +45 @@
 #endif
 
-/* ignored: -v -d -t -i */
-#define OPTION_STRING           "fldnra" "vdt:i"
+/* Ignored: -v -t -i
+ * bbox always acts as if -d is present.
+ * -D can be used to suppress it (bbox extension).
+ * Rationale:
+ * (1) util-linux's umount does it if "loop=..." is seen in /etc/mtab:
+ * thus, on many systems, bare umount _does_ drop loop devices.
+ * (2) many users request this feature.
+ */
+#define OPTION_STRING           "fldDnra" "vt:i"
 #define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
 #define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
-#define OPT_FREELOOP            (1 << 2)
-#define OPT_NO_MTAB             (1 << 3)
-#define OPT_REMOUNT             (1 << 4)
-#define OPT_ALL                 (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 5) : 0)
+//#define OPT_FREE_LOOP           (1 << 2) // -d is assumed always present
+#define OPT_DONT_FREE_LOOP      (1 << 3)
+#define OPT_NO_MTAB             (1 << 4)
+#define OPT_REMOUNT             (1 << 5)
+#define OPT_ALL                 (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 6) : 0)
 
 int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -145 +174 @@
             // De-allocate the loop device.  This ioctl should be ignored on
             // any non-loop block devices.
-            if (ENABLE_FEATURE_MOUNT_LOOP && (opt & OPT_FREELOOP) && m)
+            if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONT_FREE_LOOP) && m)
                 del_loop(m->device);
             if (ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)