diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-10-04 04:15:08 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-10-04 04:15:08 +0200 |
commit | 77009452cfd25208509b14ea985e81fdf9f7d40e (patch) | |
tree | cbf5c867d7ceaed2137ea2a2d60da88eaeca6f27 /src/core/mount.c | |
parent | Introduce _cleanup_endmntent_ (diff) | |
download | systemd-77009452cfd25208509b14ea985e81fdf9f7d40e.tar.xz systemd-77009452cfd25208509b14ea985e81fdf9f7d40e.zip |
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
Diffstat (limited to 'src/core/mount.c')
-rw-r--r-- | src/core/mount.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index 3d46557fb1..93bfa99f3f 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1440,6 +1440,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)); @@ -1466,7 +1469,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; |