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

units: automatically order all mount units after network.target

Browse source 
Previously it was necessary to pull in remote-fs-pre.target to order the
mount units against network.target since the ordering was done
transitively via remote-fs-pre.target.

As network implementations shouldn't need to know about the specific
use-case of network mounts we instead now simply order network.target
against all mounts too. This should make it unnecessary for network
managing services to import remote-fs-pre.target explicitly, as
network.target will now suffice.
This commit is contained in:
Lennart Poettering 2013-03-27 02:51:33 +01:00
parent 1183f9b225
commit a63a5c4687
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/core/mount.c
View file

@ -441,7 +441,7 @@ static int mount_add_quota_links(Mount *m) {
static int mount_add_default_dependencies(Mount *m) {
int r;
MountParameters *p;
const char *after, *setup;
const char *after, *after2, *setup;
assert(m);
@ -458,9 +458,11 @@ static int mount_add_default_dependencies(Mount *m) {
if (mount_is_network(p)) {
after = SPECIAL_REMOTE_FS_PRE_TARGET;
after2 = SPECIAL_NETWORK_TARGET;
setup = SPECIAL_REMOTE_FS_SETUP_TARGET;
} else {
after = SPECIAL_LOCAL_FS_PRE_TARGET;
after2 = NULL;
setup = NULL;
}
@ -468,6 +470,12 @@ static int mount_add_default_dependencies(Mount *m) {
if (r < 0)
return r;
if (after2) {
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true);
if (r < 0)
return r;
}
if (setup) {
r = unit_add_dependency_by_name(UNIT(m), UNIT_WANTS, setup, NULL, true);
if (r < 0)