X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbusybox%2Fpatches%2F480-mount_union.patch;h=e520d781b22b6c9aa8d01edad9606f2beae035eb;hb=HEAD;hp=7585d68ddda7f119b9002322abece5cfe754a9bf;hpb=7b7b2eed91d7c348096c37f4df701d6ce65401c1;p=openwrt-10.03%2F.git

diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch
index 7585d68dd..e520d781b 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 */
+@@ -69,6 +69,10 @@
+ #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)
+@@ -185,6 +189,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"
+@@ -239,6 +244,7 @@ static const char mount_option_str[] =
+ 		"rslave\0"
+ 		"rprivate\0"
+ 		"runbindable\0"
 +		"union" "\0"
  	)