Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/find_mount_point.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/libbb/find_mount_point.c (modified) (2 diffs)

branches/3.2/mindi-busybox/libbb/find_mount_point.c

@@ -31 +31 @@
     devno_of_name = s.st_dev;
     block_dev = 0;
-    if (S_ISBLK(s.st_mode)) {
+    /* Why S_ISCHR? - UBI volumes use char devices, not block */
+    if (S_ISBLK(s.st_mode) || S_ISCHR(s.st_mode)) {
         devno_of_name = s.st_rdev;
         block_dev = 1;
@@ -44 +45 @@
          * and it makes sense to always ignore it.
          * Otherwise people can't reference their "real" root! */
-        if (strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
+        if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
             continue;