X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9dfc3e34ee54d00b68cc4cbb5cddcfa588fd07fb..52f10ff67fb41ea3738a4b0ab48b561c22200009:/package/busybox/patches/480-mount_union.patch?ds=sidebyside

diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch
index 2a22322ae..2f236a152 100644
--- 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
+@@ -136,6 +136,10 @@
+ # include <rpc/pmap_clnt.h>
  #endif
  
 +#ifndef MS_UNION
@@ -11,19 +11,19 @@
  
  #if defined(__dietlibc__)
  // 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
-@@ -152,6 +156,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.
-@@ -206,6 +211,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.