summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/480-mount_union.patch
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-10-21 23:08:45 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-10-21 23:08:45 +0000
commitb90f9dbb187a41ac6b2033d9c61892c3ffb9da71 (patch)
treeaeaf726e05602de4a3b53c1a471a8d14de9f5453 /package/busybox/patches/480-mount_union.patch
parent669969fe1c0d74832ed1d03d1e51b61bfecadeb1 (diff)
[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.patch16
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 b9eee8cb6..2f236a152 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.