picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mount: only add those mount points to localfs.target as Wants that are marked for us

This commit is contained in:
Lennart Poettering 2010-04-13 21:55:34 +02:00
parent d8b4e2e9ac
commit 9fcc065a77
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mount.c
View File

@ -244,6 +244,8 @@ static int mount_add_target_links(Mount *m) {
MountParameters *p;
Unit *u;
int r;
bool noauto;
bool handle;
assert(m);
@ -254,10 +256,10 @@ static int mount_add_target_links(Mount *m) {
else
return 0;
if (!p->fstype)
return 0;
noauto = mount_test_option(p->options, MNTOPT_NOAUTO);
handle = mount_test_option(p->options, "comment=systemd.mount");
if (mount_test_option(p->options, MNTOPT_NOAUTO))
if (noauto && !handle)
return 0;
if (mount_test_option(p->options, "_netdev") ||
@ -269,8 +271,9 @@ static int mount_add_target_links(Mount *m) {
if ((r = manager_load_unit(UNIT(m)->meta.manager, target, &u)) < 0)
return r;
if ((r = unit_add_dependency(u, UNIT_WANTS, UNIT(m))) < 0)
return r;
if (handle)
if ((r = unit_add_dependency(u, UNIT_WANTS, UNIT(m))) < 0)
return r;
return unit_add_dependency(UNIT(m), UNIT_BEFORE, u);
}