[systemd-commits] src/fstab-generator

[Lennart Poettering]

 src/fstab-generator/fstab-generator.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit f9ea108e7c3544c03822277a1112a48dc62f6ed4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Dec 24 13:01:00 2012 +0100

    fstab-generator: properly detect bind mounts
    
    This kinda undoes a83cbaccd03c3f28e47e9330f4a22ff65ce4b561 and
    1d634e21b453f3c80d7c6c4bd90a6b84e42a3d2a but corrects the original code
    to compare the mount type with "bind" rather than the mount options.

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index ba55f2c..23e5051 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -194,6 +194,14 @@ finish:
         return r;
 }
 
+static bool mount_is_bind(struct mntent *me) {
+        assert(me);
+
+        return
+                hasmntopt(me, "bind") ||
+                streq(me->mnt_type, "bind");
+}
+
 static bool mount_is_network(struct mntent *me) {
         assert(me);
 
@@ -226,7 +234,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
                 return 0;
 
         isnetwork = mount_is_network(me);
-        isbind = !!hasmntopt(me, "bind");
+        isbind = mount_is_bind(me);
 
         noauto = !!hasmntopt(me, "noauto");
         nofail = !!hasmntopt(me, "nofail");