Merge branch 'busybox' into merge

5 files changed, 22 insertions, 10 deletions

diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 8434dd6ad..f524bc239 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -83,11 +83,11 @@ char BUG_wrong_field_size(void);
 #define STORE_LE(field, value) \
 do { \
         if (sizeof(field) == 4) \
-                field = SWAP_LE32(value); \
+                field = SWAP_LE32((uint32_t)(value)); \
         else if (sizeof(field) == 2) \
-                field = SWAP_LE16(value); \
+                field = SWAP_LE16((uint16_t)(value)); \
         else if (sizeof(field) == 1) \
-                field = (value); \
+                field = (uint8_t)(value); \
         else \
                 BUG_wrong_field_size(); \
 } while (0)
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 426854b1e..26a919536 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -210,11 +210,11 @@ void BUG_unsupported_field_size(void);
 #define STORE_LE(field, value) \
 do { \
         if (sizeof(field) == 4) \
-                field = SWAP_LE32(value); \
+                field = SWAP_LE32((uint32_t)(value)); \
         else if (sizeof(field) == 2) \
-                field = SWAP_LE16(value); \
+                field = SWAP_LE16((uint16_t)(value)); \
         else if (sizeof(field) == 1) \
-                field = (value); \
+                field = (uint8_t)(value); \
         else \
                 BUG_unsupported_field_size(); \
 } while (0)
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 4eade0869..fa2e7b114 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -244,7 +244,11 @@
  * uclibc faq entry rather than in busybox... */
 # if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
 #  warning "You probably need to build uClibc with UCLIBC_HAS_RPC for NFS support"
-   /* not #error, since user may be using e.g. libtirpc instead */
+   /* not #error, since user may be using e.g. libtirpc instead.
+    * This might work:
+    * CONFIG_EXTRA_CFLAGS="-I/usr/include/tirpc"
+    * CONFIG_EXTRA_LDLIBS="tirpc"
+    */
 # endif
 # include <rpc/rpc.h>
 # include <rpc/pmap_prot.h>
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 2d1802b79..947dd0cdc 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -39,6 +39,12 @@
 #include <sys/mount.h>
 #if ENABLE_RUN_INIT
 # include <sys/prctl.h>
+# ifndef PR_CAPBSET_READ
+# define PR_CAPBSET_READ 23
+# endif
+# ifndef PR_CAPBSET_DROP
+# define PR_CAPBSET_DROP 24
+# endif
 # include <linux/capability.h>
 // #include <sys/capability.h>
 // This header is in libcap, but the functions are in libc.
diff --git a/util-linux/umount.c b/util-linux/umount.c
index b45cd8a6b..e2329f8b3 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -57,6 +57,7 @@
 //usage:        IF_FEATURE_MOUNT_LOOP(
 //usage:     "\n        -d      Free loop device if it has been used"
 //usage:        )
+//usage:     "\n        -t FSTYPE[,...] Unmount only these filesystem type(s)"
 //usage:
 //usage:#define umount_example_usage
 //usage:       "$ umount /dev/hdc1\n"
@@ -81,8 +82,8 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
 }
 #endif
 
-/* ignored: -c -v -t -i */
-#define OPTION_STRING           "fldnra" "cvt:i"
+/* ignored: -c -v -i */
+#define OPTION_STRING           "fldnrat:" "cvi"
 #define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
 #define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
 #define OPT_FREELOOP            (1 << 2)
@@ -143,7 +144,8 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
         }
 
         // If we're not umounting all, we need at least one argument.
-        if (!(opt & OPT_ALL) && !fstype) {
+        // Note: "-t FSTYPE" does not imply -a.
+        if (!(opt & OPT_ALL)) {
                 if (!argv[0])
                         bb_show_usage();
                 m = NULL;