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 | 49254e2b2c2f65a21be6c38c3afc0b9d4832f3fb (patch) | |
| tree | 0c8df24973e5339e60c5aae5a5d461d18d373cac /package/busybox/patches/480-mount_union.patch | |
| parent | b36c9d3cec0da6a0e1e3ba5f1fbbdac9de750312 (diff) | |
| download | upstream-49254e2b2c2f65a21be6c38c3afc0b9d4832f3fb.tar.gz upstream-49254e2b2c2f65a21be6c38c3afc0b9d4832f3fb.tar.bz2 upstream-49254e2b2c2f65a21be6c38c3afc0b9d4832f3fb.zip | |
[package] busybox: update to v1.14.4 (closes: #5619)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17782 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 | 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" ) |