From be168b119750beacc0d0212607c6fa3ee87f238c Mon Sep 17 00:00:00 2001
From: Vladimir Dronnikov
Date: Mon, 5 Oct 2009 02:18:01 +0200
Subject: 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>
---
 util-linux/mount.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'util-linux')

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 9f465f1..1c51373 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -19,6 +19,9 @@
 #include <mntent.h>
 #include <syslog.h>
 #include <sys/mount.h>
+#ifndef MS_UNION
+# define MS_UNION       (1 << 8)
+#endif
 #ifndef MS_BIND
 # define MS_BIND        (1 << 12)
 #endif
@@ -177,6 +180,7 @@ static const int32_t mount_options[] = {
 		/* "loud"        */ ~MS_SILENT,
 
 		// action flags
+		/* "union"       */ MS_UNION,
 		/* "bind"        */ MS_BIND,
 		/* "move"        */ MS_MOVE,
 		/* "shared"      */ MS_SHARED,
@@ -231,6 +235,7 @@ static const char mount_option_str[] =
 		"loud\0"
 
 		// action flags
+		"union\0"
 		"bind\0"
 		"move\0"
 		"shared\0"
-- 
cgit v1.1