summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-28 01:50:05 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-28 14:30:50 -0500
commit9d05dd2e1ef814a714214004f927ce82c9890fa6 (patch)
tree16d3dc93939385960efb04847b38a5964c141474 /src/core
parentaffc3d834347076e8616948978e70ed1fca84db4 (diff)
mount: simplify mount_needs_network check
Diffstat (limited to 'src/core')
-rw-r--r--src/core/mount.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/core/mount.c b/src/core/mount.c
index 5f2de64eb9..bccf6c5bfa 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1441,17 +1441,13 @@ static int mount_add_one(
}
}
- if (m->running_as == SYSTEMD_SYSTEM) {
- const char* target;
-
- target = mount_needs_network(options, fstype) ? SPECIAL_REMOTE_FS_TARGET : NULL;
+ if (m->running_as == SYSTEMD_SYSTEM &&
+ mount_needs_network(options, fstype)) {
/* _netdev option may have shown up late, or on a
* remount. Add remote-fs dependencies, even though
- * local-fs ones may already be there */
- if (target) {
- unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
- load_extras = true;
- }
+ * local-fs ones may already be there. */
+ unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_REMOTE_FS_TARGET, NULL, true);
+ load_extras = true;
}
if (u->load_state == UNIT_NOT_FOUND) {