[package] busybox: update to v1.14.4 (closes: #5619)

[openwrt-10.03/.git] / package / busybox / patches / 480-mount_union.patch

diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch
index 7585d68ddda7f119b9002322abece5cfe754a9bf..2a22322aee3646e46f80d3b46291f680bcc3ef37 100644 (file)
--- a/package/busybox/patches/480-mount_union.patch
+++ b/package/busybox/patches/480-mount_union.patch
@@ -1,7 +1,7 @@
 --- a/util-linux/mount.c
 +++ b/util-linux/mount.c
 @@ -42,6 +42,10 @@
- #define MS_DIRSYNC      128     /* Directory modifications are synchronous */
+ #define MS_DIRSYNC      128     // Directory modifications are synchronous
  #endif
  
 +#ifndef MS_UNION
@@ -10,8 +10,8 @@
 +
  
  #if defined(__dietlibc__)
- /* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
-@@ -152,6 +156,7 @@
+ // 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
+@@ -152,6 +156,7 @@ static const int32_t mount_options[] = {
                /* "rslave"      */ MS_SLAVE|MS_RECURSIVE,
                /* "rprivate"    */ MS_SLAVE|MS_RECURSIVE,
                /* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE,
@@ -19,10 +19,10 @@
        )
  
        // Always understood.
-@@ -206,6 +211,7 @@
-               "rslave" "\0"
-               "rprivate" "\0"
-               "runbindable" "\0"
+@@ -206,6 +211,7 @@ static const char mount_option_str[] =
+               "rslave\0"
+               "rprivate\0"
+               "runbindable\0"
 +              "union" "\0"
        )