From bed59840a1fbac42d72dd4e324537a08c827ce9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 3 Oct 2013 22:15:08 -0400 Subject: [PATCH] systemd: order remote mounts from mountinfo before remote-fs.target Usually the network is stopped before filesystems are umounted. Ordering network filesystems before remote-fs.target means that their unmounting will be performed earlier, and can terminate sucessfully. https://bugs.freedesktop.org/show_bug.cgi?id=70002 --- src/core/mount.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/mount.c b/src/core/mount.c index 10073b50b..8777b47ca 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1508,6 +1508,9 @@ static int mount_add_one( u = manager_get_unit(m, e); if (!u) { + const char* const target = + fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET; + delete = true; u = unit_new(m, sizeof(Mount)); @@ -1534,7 +1537,7 @@ static int mount_add_one( goto fail; } - r = unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_LOCAL_FS_TARGET, NULL, true); + r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true); if (r < 0) goto fail;