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

mount: imply noauto for mount points configured with native mount files

Browse source
This commit is contained in:
Lennart Poettering 2010-08-25 21:24:21 +02:00
parent ca2937ce0b
commit 81bf310edc
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mount.c
View file

@ -266,7 +266,11 @@ static int mount_add_target_links(Mount *m) {
return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, UNIT(am), true);
} else {
if (!noauto && handle)
/* Automatically add mount points that aren't natively
* configured to local-fs.target */
if (!noauto &&
handle &&
!m->from_fragment)
if (user || m->meta.manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0)
return r;

5
src/swap.c
View file

@ -113,7 +113,10 @@ static int swap_add_target_links(Swap *s) {
if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 0)
return r;
if (!p->noauto && (p->handle || s->meta.manager->swap_auto) && s->meta.manager->running_as == MANAGER_SYSTEM)
if (!p->noauto &&
(p->handle || s->meta.manager->swap_auto) &&
!s->from_fragment &&
s->meta.manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;