diff --git a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch index ee4e6154..beb4ffd7 100644 --- a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch +++ b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch @@ -1,4 +1,4 @@ -From 2c821a6c31ce3e2af53274b26fc34648933f6574 Mon Sep 17 00:00:00 2001 +From 6eb24d1fcf8ea676bd0f0e32a9afda7431eafd77 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Wed, 4 May 2016 17:40:04 +0200 Subject: [PATCH] sysv-generator: translate "Required-Start" into a "Wants" @@ -12,11 +12,13 @@ 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] +[fbui: patch sysv-generator-test.py to take this SUSE's specifity into account] [wfink: fixes bsc#857204] --- src/sysv-generator/sysv-generator.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + test/sysv-generator-test.py | 2 +- + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 4485e2e368..e0833a7179 100644 @@ -37,6 +39,19 @@ index 4485e2e368..e0833a7179 100644 if (r < 0) return log_oom(); } +diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py +index 24fafbaaa4..827d802a17 100755 +--- a/test/sysv-generator-test.py ++++ b/test/sysv-generator-test.py +@@ -224,7 +224,7 @@ class SysvGeneratorTest(unittest.TestCase): + self.add_sysv('foo', {'Required-Start': '$named $portmap'}) + s = self.run_generator()[1]['foo.service'] + self.assertEqual(set(s.options('Unit')), +- set(['Documentation', 'SourcePath', 'Description', 'After'])) ++ set(['Documentation', 'SourcePath', 'Description', 'After', 'Wants'])) + self.assertEqual(s.get('Unit', 'After').split(), ['nss-lookup.target', 'rpcbind.target']) + + def test_lsb_deps(self): -- 2.35.3 diff --git a/systemd.changes b/systemd.changes index 42fef767..a6511375 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 25 09:08:21 UTC 2024 - Franck Bui + +- Update 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch to + adapt sysv-generator-test to the SUSE's specificity brought by this patch. + ------------------------------------------------------------------- Thu Apr 25 08:57:30 UTC 2024 - Franck Bui