forked from pool/systemd
Frederic Crozat
2176c3ed9b
+ reason why a service failed is now exposed in the"Result" D-Bus
property.
+ Rudimentary service watchdog support (not complete)
+ Improve bootcharts, by immediatly changing argv[0] after
forking to to reflect which process will be executed.
+ Various bug fixes.
- Add remote-fs-after-network.patch and update insserv patch:
ensure remote-fs-pre.target is enabled and started before network
mount points (bnc#744293).
- Ensure journald doesn't prevent syslogs to read from /proc/kmsg.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=240
75 lines
2.6 KiB
Diff
75 lines
2.6 KiB
Diff
From db1355b1c181a4b1ac277064918d7c794dfb6edd Mon Sep 17 00:00:00 2001
|
|
From: Michal Schmidt <mschmidt@redhat.com>
|
|
Date: Tue, 7 Feb 2012 11:05:18 +0100
|
|
Subject: [PATCH] mount: adjust dependencies for remote filesystems
|
|
|
|
Currently remote mounts automatically get:
|
|
After=remote-fs-pre.target network.target
|
|
|
|
remote-fs-pre.target is already After=network.target. Just make sure
|
|
remote-fs-pre.target is pulled in by remote-fs.target if any remote
|
|
filesystems are configured.
|
|
For the mount units it is then sufficient to get:
|
|
After=remote-fs-pre.target
|
|
|
|
Later NetworkManager will hook its NM-wait-online.service into
|
|
remote-fs-pre.target.wants in order to remove the need for the administrator
|
|
to enable the service manually when he has any remote filesystems.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=787314
|
|
---
|
|
src/mount.c | 20 ++++++++++++--------
|
|
1 files changed, 12 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/mount.c b/src/mount.c
|
|
index 3411b73..0ae964b 100644
|
|
--- a/src/mount.c
|
|
+++ b/src/mount.c
|
|
@@ -320,7 +320,7 @@ static bool needs_quota(MountParameters *p) {
|
|
}
|
|
|
|
static int mount_add_fstab_links(Mount *m) {
|
|
- const char *target, *after = NULL, *after2 = NULL;
|
|
+ const char *target, *after, *tu_wants = NULL;
|
|
MountParameters *p;
|
|
Unit *tu;
|
|
int r;
|
|
@@ -350,23 +350,27 @@ static int mount_add_fstab_links(Mount *m) {
|
|
|
|
if (mount_is_network(p)) {
|
|
target = SPECIAL_REMOTE_FS_TARGET;
|
|
- after = SPECIAL_REMOTE_FS_PRE_TARGET;
|
|
- after2 = SPECIAL_NETWORK_TARGET;
|
|
+ after = tu_wants = SPECIAL_REMOTE_FS_PRE_TARGET;
|
|
} else {
|
|
target = SPECIAL_LOCAL_FS_TARGET;
|
|
after = SPECIAL_LOCAL_FS_PRE_TARGET;
|
|
}
|
|
|
|
- if ((r = manager_load_unit(UNIT(m)->manager, target, NULL, NULL, &tu)) < 0)
|
|
+ r = manager_load_unit(UNIT(m)->manager, target, NULL, NULL, &tu);
|
|
+ if (r < 0)
|
|
return r;
|
|
|
|
- if (after)
|
|
- if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
|
|
+ if (tu_wants) {
|
|
+ r = unit_add_dependency_by_name(tu, UNIT_WANTS, tu_wants, NULL, true);
|
|
+ if (r < 0)
|
|
return r;
|
|
+ }
|
|
|
|
- if (after2)
|
|
- if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true)) < 0)
|
|
+ if (after) {
|
|
+ r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true);
|
|
+ if (r < 0)
|
|
return r;
|
|
+ }
|
|
|
|
if (automount) {
|
|
Unit *am;
|
|
--
|
|
1.7.7
|
|
|