Patch from Gernot Poerner <gp@it-netservice.de>. Adds in

mount bind support.

diff --git a/applets/usage.h b/applets/usage.h
index 9b83297e4e931731912320c9650dfe4c3f25f12b..dd100332c993374bb0fe6bc5f4c9d0ca58f6ff8a 100644 (file)
--- 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 9b83297e4e931731912320c9650dfe4c3f25f12b..dd100332c993374bb0fe6bc5f4c9d0ca58f6ff8a 100644 (file)
--- 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 4e0e3e42863daf6b4e615abb8c373a2c8e537cd6..e40d75f794856e9ae1059526e0eb555729f1f821 100644 (file)
--- 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 9b83297e4e931731912320c9650dfe4c3f25f12b..dd100332c993374bb0fe6bc5f4c9d0ca58f6ff8a 100644 (file)
--- 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 4e0e3e42863daf6b4e615abb8c373a2c8e537cd6..e40d75f794856e9ae1059526e0eb555729f1f821 100644 (file)
--- 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}
 };