diff options
author | Nicolas Thill <nico@openwrt.org> | 2009-09-28 12:38:46 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2009-09-28 12:38:46 +0000 |
commit | 91750d01a7a0b56a880a147a825d097aaac7f53d (patch) | |
tree | 20de5267e6400c96be022906c833acdb5f7eb6d0 /package/busybox/patches/480-mount_union.patch | |
parent | 6fa03d63d4d34ef38a5fde5292cb7f65c06d56b2 (diff) | |
download | upstream-91750d01a7a0b56a880a147a825d097aaac7f53d.tar.gz upstream-91750d01a7a0b56a880a147a825d097aaac7f53d.tar.bz2 upstream-91750d01a7a0b56a880a147a825d097aaac7f53d.zip |
busybox: update to v1.14.4 (closes: #5619)
SVN-Revision: 17782
Diffstat (limited to 'package/busybox/patches/480-mount_union.patch')
-rw-r--r-- | package/busybox/patches/480-mount_union.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch index 7585d68ddd..2a22322aee 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 */ + #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" ) |