shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00
Code

mount: don't pull in nofail mounts by default, but use them if they are around

Browse Source
This commit is contained in:
Lennart Poettering 2010-10-29 06:05:02 +02:00
parent e6a3ff9593
commit d91430063e
1 changed files with 3 additions and 1 deletions

4
src/mount.c

@ -265,7 +265,7 @@ static int mount_add_target_links(Mount *m) {
MountParameters *p;
Unit *tu;
int r;
bool noauto, handle, automount;
bool noauto, nofail, handle, automount;
assert(m);
@ -277,6 +277,7 @@ static int mount_add_target_links(Mount *m) {
return 0;
noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO);
nofail = !!mount_test_option(p->options, "nofail");
handle = !!mount_test_option(p->options, "comment=systemd.mount") ||
m->meta.manager->mount_auto;
automount = !!mount_test_option(p->options, "comment=systemd.automount");
@ -309,6 +310,7 @@ static int mount_add_target_links(Mount *m) {
/* Automatically add mount points that aren't natively
* configured to local-fs.target */
if (!noauto &&
!nofail &&
handle &&
m->from_etc_fstab &&
m->meta.manager->running_as == MANAGER_SYSTEM)