From 2a9ae92aa1da3c12fb507360fe0d8a603edaba69 Mon Sep 17 00:00:00 2001 From: Jeff Erbrecht Date: Fri, 11 Oct 2024 10:29:35 -0400 Subject: [PATCH 1/2] Revert "Constrain systemd-sysvcompat to SUSE 15.x only (#439)" This reverts commit 25e0b1ade762ccf05e0fa61e4ff3578df53b4de3. --- config/projects/google-fluentd.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/config/projects/google-fluentd.rb b/config/projects/google-fluentd.rb index f0790e02..279a4f9d 100644 --- a/config/projects/google-fluentd.rb +++ b/config/projects/google-fluentd.rb @@ -53,12 +53,10 @@ runtime_dependency "insserv-compat" # sysvinit-tools is required for insserv-compat, but isn't a dependency runtime_dependency "sysvinit-tools" - if /^15/ =~ ohai["platform_version"] - # systemd-sysvcompat is required for providing - # /usr/lib/systemd/systemd-sysv-install, which is needed for init.d and - # is missing from SLES 15.6 onwards (b/372000696) - runtime_dependency "systemd-sysvcompat" - end + # systemd-sysvcompat is required for providing + # /usr/lib/systemd/systemd-sysv-install, which is needed for init.d and + # is missing from SLES 15.6 onwards (b/372000696) + runtime_dependency "systemd-sysvcompat" end end From c371cc85c1c077831ab1d0c0220d03f94f6b831e Mon Sep 17 00:00:00 2001 From: Jeff Erbrecht Date: Fri, 11 Oct 2024 10:29:53 -0400 Subject: [PATCH 2/2] Revert "Require systemd-sysvcompat on SUSE (#436)" This reverts commit 6777afbd8b3923e37c08ff3d1af25c3ab694abb3. --- config/projects/google-fluentd.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/projects/google-fluentd.rb b/config/projects/google-fluentd.rb index 279a4f9d..ff326fed 100644 --- a/config/projects/google-fluentd.rb +++ b/config/projects/google-fluentd.rb @@ -53,10 +53,6 @@ runtime_dependency "insserv-compat" # sysvinit-tools is required for insserv-compat, but isn't a dependency runtime_dependency "sysvinit-tools" - # systemd-sysvcompat is required for providing - # /usr/lib/systemd/systemd-sysv-install, which is needed for init.d and - # is missing from SLES 15.6 onwards (b/372000696) - runtime_dependency "systemd-sysvcompat" end end