shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-26 09:57:26 +03:00
Code

fstab-generator: properly detect bind mounts

Browse Source 
This kinda undoes a83cbaccd03c3f28e47e9330f4a22ff65ce4b561 and
1d634e21b453f3c80d7c6c4bd90a6b84e42a3d2a but corrects the original code
to compare the mount type with "bind" rather than the mount options.
This commit is contained in:
Lennart Poettering 2012-12-24 13:01:00 +01:00
parent 95b4be1719
commit f9ea108e7c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fstab-generator/fstab-generator.c
View File

@ -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");