From a2803bf3c813ef0bb08a4a66a7b082759422aa85 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 8 Sep 2022 19:32:30 +0100 Subject: [PATCH] 0.15.2 --- ...faultDependencies-to-fix-cycle-error.patch | 56 ------------------- greenboot.spec | 7 ++- sources | 2 +- 3 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 0001-disable-DefaultDependencies-to-fix-cycle-error.patch diff --git a/0001-disable-DefaultDependencies-to-fix-cycle-error.patch b/0001-disable-DefaultDependencies-to-fix-cycle-error.patch deleted file mode 100644 index 88e4c0d..0000000 --- a/0001-disable-DefaultDependencies-to-fix-cycle-error.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 483cff9b89abc30f218f223bef98704639bd08e7 Mon Sep 17 00:00:00 2001 -From: Sayan Paul -Date: Mon, 29 Aug 2022 22:33:06 +0530 -Subject: [PATCH] disable DefaultDependencies to fix cycle error - -The fix relaxes the dependecies of task-runner and status service that -otherwise causes issue in the service to start as well as missing -logs -signed off: saypaul@fedoraproject.org ---- - usr/lib/systemd/system/greenboot-grub2-set-success.service | 2 ++ - usr/lib/systemd/system/greenboot-status.service | 1 + - usr/lib/systemd/system/greenboot-task-runner.service | 2 ++ - 3 files changed, 5 insertions(+) - -diff --git a/usr/lib/systemd/system/greenboot-grub2-set-success.service b/usr/lib/systemd/system/greenboot-grub2-set-success.service -index f5ef55a..87a7a61 100644 ---- a/usr/lib/systemd/system/greenboot-grub2-set-success.service -+++ b/usr/lib/systemd/system/greenboot-grub2-set-success.service -@@ -11,6 +11,8 @@ - Description=Mark boot as successful in grubenv - Requires=boot-complete.target - After=boot-complete.target -+Conflicts=redboot.target -+DefaultDependencies=no - - [Service] - Type=oneshot -diff --git a/usr/lib/systemd/system/greenboot-status.service b/usr/lib/systemd/system/greenboot-status.service -index b12ec2f..f52c183 100644 ---- a/usr/lib/systemd/system/greenboot-status.service -+++ b/usr/lib/systemd/system/greenboot-status.service -@@ -12,6 +12,7 @@ Description=greenboot MotD Generator - After=greenboot-healthcheck.service - After=greenboot-task-runner.service - After=redboot-task-runner.service -+DefaultDependencies=no - - [Service] - Type=oneshot -diff --git a/usr/lib/systemd/system/greenboot-task-runner.service b/usr/lib/systemd/system/greenboot-task-runner.service -index d1fc07f..bf5e94b 100644 ---- a/usr/lib/systemd/system/greenboot-task-runner.service -+++ b/usr/lib/systemd/system/greenboot-task-runner.service -@@ -11,6 +11,8 @@ - Description=greenboot Success Scripts Runner - Requires=boot-complete.target - After=boot-complete.target -+Conflicts=redboot.target -+DefaultDependencies=no - - [Service] - Type=oneshot --- -2.37.2 - diff --git a/greenboot.spec b/greenboot.spec index 04e846b..72c4e1e 100644 --- a/greenboot.spec +++ b/greenboot.spec @@ -1,8 +1,8 @@ %global debug_package %{nil} Name: greenboot -Version: 0.15.1 -Release: 2%{?dist} +Version: 0.15.2 +Release: 1%{?dist} Summary: Generic Health Check Framework for systemd License: LGPLv2+ @@ -172,6 +172,9 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam %{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh %changelog +* Thu Sep 08 2022 Peter Robinson - 0.15.2-1 +- Update to 0.15.2 + * Wed Aug 31 2022 Peter Robinson - 0.15.1-2 - disable DefaultDependencies to fix cycle error diff --git a/sources b/sources index e93a7a3..d6fd674 100755 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (greenboot-0.15.1.tar.gz) = 756dd5840ead975082f20defb83489a75b4a3370eaf43a9aa6b7b4dad925597ddf5518e2a0566d1545189bf2e31d2200e626a602433b6a5f5a0d2cb5511dd6d8 +SHA512 (greenboot-0.15.2.tar.gz) = c3d9219cf83d2691368d649e7f29b60f6d5ce65cc1b00f09980c2a917e1e2755ef39850502883c35e67a52ba4fe2899248820949cf32d8d375a26201ba8e72f5