Merge branch 'c9s' of gitlab.com:redhat/centos-stream/rpms/greenboot into c9s

This commit is contained in:
Peter Robinson 2022-09-01 20:21:12 +01:00
commit 9e6d067d85
1 changed files with 56 additions and 0 deletions

View File

@ -0,0 +1,56 @@
From 483cff9b89abc30f218f223bef98704639bd08e7 Mon Sep 17 00:00:00 2001
From: Sayan Paul <saypaul@redhat.com>
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