diff options
author | Vladimir Dronnikov <dronnikov@gmail.com> | 2009-10-05 02:18:01 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-05 02:18:01 +0200 |
commit | be168b119750beacc0d0212607c6fa3ee87f238c (patch) | |
tree | 95240a7661366674fd9cdf2741e8ab1bfe823ba5 /util-linux | |
parent | 301f5ecb8d5fc1ed85942dd85d58f27a0c9a518a (diff) | |
download | busybox-w32-be168b119750beacc0d0212607c6fa3ee87f238c.tar.gz busybox-w32-be168b119750beacc0d0212607c6fa3ee87f238c.tar.bz2 busybox-w32-be168b119750beacc0d0212607c6fa3ee87f238c.zip |
wget: fix for code 302; mount: support -o union
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/mount.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 9f465f131..1c5137376 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -19,6 +19,9 @@ | |||
19 | #include <mntent.h> | 19 | #include <mntent.h> |
20 | #include <syslog.h> | 20 | #include <syslog.h> |
21 | #include <sys/mount.h> | 21 | #include <sys/mount.h> |
22 | #ifndef MS_UNION | ||
23 | # define MS_UNION (1 << 8) | ||
24 | #endif | ||
22 | #ifndef MS_BIND | 25 | #ifndef MS_BIND |
23 | # define MS_BIND (1 << 12) | 26 | # define MS_BIND (1 << 12) |
24 | #endif | 27 | #endif |
@@ -177,6 +180,7 @@ static const int32_t mount_options[] = { | |||
177 | /* "loud" */ ~MS_SILENT, | 180 | /* "loud" */ ~MS_SILENT, |
178 | 181 | ||
179 | // action flags | 182 | // action flags |
183 | /* "union" */ MS_UNION, | ||
180 | /* "bind" */ MS_BIND, | 184 | /* "bind" */ MS_BIND, |
181 | /* "move" */ MS_MOVE, | 185 | /* "move" */ MS_MOVE, |
182 | /* "shared" */ MS_SHARED, | 186 | /* "shared" */ MS_SHARED, |
@@ -231,6 +235,7 @@ static const char mount_option_str[] = | |||
231 | "loud\0" | 235 | "loud\0" |
232 | 236 | ||
233 | // action flags | 237 | // action flags |
238 | "union\0" | ||
234 | "bind\0" | 239 | "bind\0" |
235 | "move\0" | 240 | "move\0" |
236 | "shared\0" | 241 | "shared\0" |