45669cffeb
material. - Extract bits from 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch which are not specific to the handling of 'Required-Start:' and move them into a new patch 1010-sysv-add-back-support-for-all-virtual-facility-and-f.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1222
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 9e6a1f4b085b29abaf90ecd05859537b837b39fe Mon Sep 17 00:00:00 2001
|
|
From: Thomas Blume <Thomas.Blume@suse.com>
|
|
Date: Wed, 4 May 2016 17:40:04 +0200
|
|
Subject: [PATCH 8/8] sysv-generator: translate "Required-Start" into a "Wants"
|
|
dependency
|
|
|
|
'Required-Start:' used to be supported by insserv but this functionality was
|
|
dropped when insserv was rewritten into a compat perl wrapper (insserv-compat),
|
|
which happened when systemd was introduced in SUSE, I guess.
|
|
|
|
It's been decided to add back the support in systemd instead of insserv-compat,
|
|
see the comments in bsc#857204.
|
|
|
|
[tblume: Port of SLES12SP1 patch 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch]
|
|
|
|
[wfink: fixes bsc#857204]
|
|
---
|
|
src/sysv-generator/sysv-generator.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
|
|
index bf23c48662..c6e1953839 100644
|
|
--- a/src/sysv-generator/sysv-generator.c
|
|
+++ b/src/sysv-generator/sysv-generator.c
|
|
@@ -409,8 +409,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text
|
|
return log_oom();
|
|
|
|
r = strv_extend(&s->wants, m);
|
|
- } else
|
|
+ } else {
|
|
r = strv_extend(is_before ? &s->before : &s->after, m);
|
|
+
|
|
+ if (startswith_no_case(full_text, "Required-Start:"))
|
|
+ r = strv_extend(&s->wants, m);
|
|
+ }
|
|
+
|
|
if (r < 0)
|
|
return log_oom();
|
|
}
|
|
--
|
|
2.31.1
|
|
|