diff options
author | Nicolas Thill <nico@openwrt.org> | 2011-10-21 23:08:45 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2011-10-21 23:08:45 +0000 |
commit | 3af110207d9034668fe9b714eb2074d280a57cce (patch) | |
tree | aeaf726e05602de4a3b53c1a471a8d14de9f5453 /package/busybox/patches/480-mount_union.patch | |
parent | a2797eb1a808a7999c0a33f160be5a5648af4a2a (diff) | |
download | upstream-3af110207d9034668fe9b714eb2074d280a57cce.tar.gz upstream-3af110207d9034668fe9b714eb2074d280a57cce.tar.bz2 upstream-3af110207d9034668fe9b714eb2074d280a57cce.zip |
[package] busybox: update to 1.19.2 (thanks to Peter Wagner)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28513 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/480-mount_union.patch')
-rw-r--r-- | package/busybox/patches/480-mount_union.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch index b9eee8cb63..2f236a1528 100644 --- a/package/busybox/patches/480-mount_union.patch +++ b/package/busybox/patches/480-mount_union.patch @@ -1,6 +1,6 @@ --- a/util-linux/mount.c +++ b/util-linux/mount.c -@@ -77,6 +77,10 @@ +@@ -136,6 +136,10 @@ # include <rpc/pmap_clnt.h> #endif @@ -11,19 +11,19 @@ #if defined(__dietlibc__) // 16.12.2006, Sampo Kellomaki (sampo@iki.fi) -@@ -194,6 +198,7 @@ static const int32_t mount_options[] = { +@@ -254,6 +258,7 @@ static const int32_t mount_options[] = { /* "rslave" */ MS_SLAVE|MS_RECURSIVE, - /* "rprivate" */ MS_SLAVE|MS_RECURSIVE, + /* "rprivate" */ MS_PRIVATE|MS_RECURSIVE, /* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE, + /* "union" */ MS_UNION, ) // Always understood. -@@ -249,6 +254,7 @@ static const char mount_option_str[] = - "rslave\0" - "rprivate\0" - "runbindable\0" -+ "union" "\0" +@@ -310,6 +315,7 @@ static const char mount_option_str[] = + "make-rslave\0" + "make-rprivate\0" + "make-runbindable\0" ++ "make-union\0" ) // Always understood. |