From 9d05dd2e1ef814a714214004f927ce82c9890fa6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 28 Nov 2014 01:50:05 -0500 Subject: [PATCH] mount: simplify mount_needs_network check --- src/core/mount.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c index 5f2de64eb..bccf6c5bf 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) { -- 2.30.2