From f9ea108e7c3544c03822277a1112a48dc62f6ed4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 24 Dec 2012 13:01:00 +0100 Subject: 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. --- src/fstab-generator/fstab-generator.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/fstab-generator') diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index ba55f2c2b7..23e5051925 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"); -- cgit v1.2.3-54-g00ecf