forked from pool/systemd
Marcus Meissner
5aeb3c6333
- Add 0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch: fix acpi memleak. - Add 0002-fix-lingering-references-to-var-lib-backlight-random.patch: fix invalid path in documentation. - Add 0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch: fix invalid memory free. - Add 0004-systemctl-fix-name-mangling-for-sysv-units.patch: fix name mangling for sysv units. - Add 0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch: fix OOM handling. - Add 0006-journald-add-missing-error-check.patch: add missing error check. - Add 0007-bus-fix-potentially-uninitialized-memory-access.patch: fix uninitialized memory access. - Add 0008-dbus-fix-return-value-of-dispatch_rqueue.patch: fix return value. - Add 0009-modules-load-fix-error-handling.patch: fix error handling. - Add 0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch: fix incorrect memory access. - Add 0011-strv-don-t-access-potentially-NULL-string-arrays.patch: fix incorrect memory access. - Add 0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch: fix invalid pointer. - Add 0014-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch: OBS-URL: https://build.opensuse.org/request/show/202117 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=452
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 77009452cfd25208509b14ea985e81fdf9f7d40e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
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 3d46557..93bfa99 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;
|
|
|
|
--
|
|
1.8.4
|
|
|