chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
affc3d8
)
mount: simplify mount_needs_network check
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Fri, 28 Nov 2014 06:50:05 +0000
(
01:50
-0500)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Fri, 28 Nov 2014 19:30:50 +0000
(14:30 -0500)
src/core/mount.c
patch
|
blob
|
history
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 5f2de64eb99d9d5e6e492ad6913708f9c2d2ebb6..bccf6c5bfa8098e7426d2be8daf6361d0ee1677a 100644
(file)
--- 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
/* _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) {
}
if (u->load_state == UNIT_NOT_FOUND) {