summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-05-21 15:59:34 +0000
committerEric Andersen2001-05-21 15:59:34 +0000
commit2f6e1f880b630751fa20cb29bafc06aa0f3d0fcb (patch)
treeb5eeecf2b4d3f523412168b046ada344f333289f
parent13a70ac2ab7cd2b87e7a8618c64b72b84e9fcabc (diff)
downloadbusybox-2f6e1f880b630751fa20cb29bafc06aa0f3d0fcb.zip
busybox-2f6e1f880b630751fa20cb29bafc06aa0f3d0fcb.tar.gz
Patch from Gernot Poerner <gp@it-netservice.de>. Adds in
mount bind support.
-rw-r--r--applets/usage.h3
-rw-r--r--include/usage.h3
-rw-r--r--mount.c2
-rw-r--r--usage.h3
-rw-r--r--util-linux/mount.c2
5 files changed, 10 insertions, 3 deletions
diff --git a/applets/usage.h b/applets/usage.h
index 9b83297..dd10033 100644
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -1087,7 +1087,7 @@
#define USAGE_MTAB(a)
#endif
#define mount_trivial_usage \
- "[flags] device directory [-o options,more-options]"
+ "[flags] device node [-o options,more-options]"
#define mount_full_usage \
"Mount a filesystem\n\n" \
"Flags:\n" \
@@ -1112,6 +1112,7 @@
"\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n" \
"\tremount:\tRe-mount a mounted filesystem, changing its flags.\n" \
"\tro/rw:\t\tMount for read-only / read-write.\n" \
+ "\tbind:\t\tUse the linux 2.4.x \"bind\" feature.\n" \
"\nThere are EVEN MORE flags that are specific to each filesystem.\n" \
"You'll have to see the written documentation for those."
#define mount_example_usage \
diff --git a/include/usage.h b/include/usage.h
index 9b83297..dd10033 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1087,7 +1087,7 @@
#define USAGE_MTAB(a)
#endif
#define mount_trivial_usage \
- "[flags] device directory [-o options,more-options]"
+ "[flags] device node [-o options,more-options]"
#define mount_full_usage \
"Mount a filesystem\n\n" \
"Flags:\n" \
@@ -1112,6 +1112,7 @@
"\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n" \
"\tremount:\tRe-mount a mounted filesystem, changing its flags.\n" \
"\tro/rw:\t\tMount for read-only / read-write.\n" \
+ "\tbind:\t\tUse the linux 2.4.x \"bind\" feature.\n" \
"\nThere are EVEN MORE flags that are specific to each filesystem.\n" \
"You'll have to see the written documentation for those."
#define mount_example_usage \
diff --git a/mount.c b/mount.c
index 4e0e3e4..e40d75f 100644
--- a/mount.c
+++ b/mount.c
@@ -70,6 +70,7 @@ enum {
S_IMMUTABLE = 512, /* Immutable file */
MS_NOATIME = 1024, /* Do not update access times. */
MS_NODIRATIME = 2048, /* Do not update directory access times */
+ MS_BIND = 4096, /* Use the new linux 2.4.x "mount --bind" feature */
};
@@ -112,6 +113,7 @@ static const struct mount_options mount_options[] = {
{"rw", ~MS_RDONLY, 0},
{"suid", ~MS_NOSUID, 0},
{"sync", ~0, MS_SYNCHRONOUS},
+ {"bind", ~0, MS_BIND},
{0, 0, 0}
};
diff --git a/usage.h b/usage.h
index 9b83297..dd10033 100644
--- a/usage.h
+++ b/usage.h
@@ -1087,7 +1087,7 @@
#define USAGE_MTAB(a)
#endif
#define mount_trivial_usage \
- "[flags] device directory [-o options,more-options]"
+ "[flags] device node [-o options,more-options]"
#define mount_full_usage \
"Mount a filesystem\n\n" \
"Flags:\n" \
@@ -1112,6 +1112,7 @@
"\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n" \
"\tremount:\tRe-mount a mounted filesystem, changing its flags.\n" \
"\tro/rw:\t\tMount for read-only / read-write.\n" \
+ "\tbind:\t\tUse the linux 2.4.x \"bind\" feature.\n" \
"\nThere are EVEN MORE flags that are specific to each filesystem.\n" \
"You'll have to see the written documentation for those."
#define mount_example_usage \
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 4e0e3e4..e40d75f 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -70,6 +70,7 @@ enum {
S_IMMUTABLE = 512, /* Immutable file */
MS_NOATIME = 1024, /* Do not update access times. */
MS_NODIRATIME = 2048, /* Do not update directory access times */
+ MS_BIND = 4096, /* Use the new linux 2.4.x "mount --bind" feature */
};
@@ -112,6 +113,7 @@ static const struct mount_options mount_options[] = {
{"rw", ~MS_RDONLY, 0},
{"suid", ~MS_NOSUID, 0},
{"sync", ~0, MS_SYNCHRONOUS},
+ {"bind", ~0, MS_BIND},
{0, 0, 0}
};