shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-14 23:24:38 +03:00
Code

mount: simplify mount_needs_network check

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-11-28 01:50:05 -05:00
parent affc3d8343
commit 9d05dd2e1e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/mount.c
View File

@ -1441,17 +1441,13 @@ static int mount_add_one(
} }
} }
if (m->running_as == SYSTEMD_SYSTEM) { if (m->running_as == SYSTEMD_SYSTEM &&
const char* target; mount_needs_network(options, fstype)) {
target = mount_needs_network(options, fstype) ? SPECIAL_REMOTE_FS_TARGET : NULL;
/* _netdev option may have shown up late, or on a /* _netdev option may have shown up late, or on a
* remount. Add remote-fs dependencies, even though * remount. Add remote-fs dependencies, even though
* local-fs ones may already be there */ * local-fs ones may already be there. */
if (target) { unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_REMOTE_FS_TARGET, NULL, true);
unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true); load_extras = true;
load_extras = true;
}
} }
if (u->load_state == UNIT_NOT_FOUND) { if (u->load_state == UNIT_NOT_FOUND) {