summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRob Landley2006-08-08 01:39:49 +0000
committerRob Landley2006-08-08 01:39:49 +0000
commite3781b731215d826585fe37720eebe147705f340 (patch)
treeb146c666feca3c4908bc5bb90842a2c0d707385b /include
parent47b16a6fe98e1b18f269a2bd34471231553ebb94 (diff)
downloadbusybox-e3781b731215d826585fe37720eebe147705f340.zip
busybox-e3781b731215d826585fe37720eebe147705f340.tar.gz
Add shared subtree support, suggested by Vladimir Dronnikov. Also break out a
few new (unfinished) config options, which I intend to make hidden (but enabled) when CONFIG_NITPICK is disabled. Getting the .config infrastructure to do that is non-obvious, it seems...
Diffstat (limited to 'include')
-rw-r--r--include/libbb.h2
-rw-r--r--include/platform.h29
2 files changed, 30 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 745f837..963a029 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -407,7 +407,7 @@ extern const char * const bb_default_login_shell;
#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6)
-extern const char bb_path_mtab_file[];
+extern char bb_path_mtab_file[];
extern int bb_default_error_retval;
diff --git a/include/platform.h b/include/platform.h
index 8890d4f..ca6f363 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -228,6 +228,35 @@ typedef unsigned long long int uintmax_t;
#if defined(__linux__)
#include <sys/mount.h>
+// Make sure we have all the new mount flags we actually try to use.
+#ifndef MS_BIND
+#define MS_BIND (1<<12)
+#endif
+#ifndef MS_MOVE
+#define MS_MOVE (1<<13)
+#endif
+#ifndef MS_RECURSIVE
+#define MS_RECURSIVE (1<<14)
+#endif
+#ifndef MS_SILENT
+#define MS_SILENT (1<<15)
+#endif
+
+// The shared subtree stuff, which went in around 2.6.15
+#ifndef MS_UNBINDABLE
+#define MS_UNBINDABLE (1<<17)
+#endif
+#ifndef MS_PRIVATE
+#define MS_PRIVATE (1<<18)
+#endif
+#ifndef MS_SLAVE
+#define MS_SLAVE (1<<19)
+#endif
+#ifndef MS_SHARED
+#define MS_SHARED (1<<20)
+#endif
+
+
#if !defined(BLKSSZGET)
#define BLKSSZGET _IO(0x12, 104)
#endif