From 2b36530190f77d7b128a87d18335269e56797437 Mon Sep 17 00:00:00 2001
From: saypaul <paul.sayan@gmail.com>
Date: Mon, 9 Sep 2024 17:43:53 +0530
Subject: [PATCH] fix: grub config path and bootc symlink

* Moved greenboot config to /etc/grub.d.
* %post symlink greenboot.cfg to bootupd if present
* %postun remove symlink from bootupd if present

Signed-off-by: saypaul <paul.sayan@gmail.com>
---
 {grub2 => etc/grub.d}/greenboot.cfg |  0
 greenboot.spec                      | 13 +++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 rename {grub2 => etc/grub.d}/greenboot.cfg (100%)

diff --git a/grub2/greenboot.cfg b/etc/grub.d/greenboot.cfg
similarity index 100%
rename from grub2/greenboot.cfg
rename to etc/grub.d/greenboot.cfg
diff --git a/greenboot.spec b/greenboot.spec
index 92a3d08..be48c71 100644
--- a/greenboot.spec
+++ b/greenboot.spec
@@ -2,7 +2,7 @@
 
 Name:               greenboot
 Version:            0.15.5
-Release:            2%{?dist}
+Release:            3%{?dist}
 Summary:            Generic Health Check Framework for systemd
 License:            LGPL-2.1-or-later
 
@@ -19,7 +19,6 @@ BuildRequires:      systemd-rpm-macros
 Requires:           systemd >= 240
 Requires:           grub2-tools-minimal
 Requires:           rpm-ostree
-Requires:           bootupd
 # PAM is required to programatically read motd messages from /etc/motd.d/*
 # This causes issues with RHEL-8 as the fix isn't there an el8 is on pam-1.3.x
 Requires:           pam >= 1.4.0
@@ -66,7 +65,6 @@ mkdir -p %{buildroot}%{_prefix}/lib/%{name}/check/required.d
 mkdir    %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d
 mkdir    %{buildroot}%{_prefix}/lib/%{name}/green.d
 mkdir    %{buildroot}%{_prefix}/lib/%{name}/red.d
-install -D -t %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d grub2/greenboot.cfg
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_unitdir}/greenboot-healthcheck.service.d
 mkdir -p %{buildroot}%{_tmpfilesdir}
@@ -79,6 +77,7 @@ install -DpZm 0644 usr/lib/tmpfiles.d/greenboot-status-motd.conf %{buildroot}%{_
 install -DpZm 0755 usr/lib/greenboot/check/required.d/* %{buildroot}%{_prefix}/lib/%{name}/check/required.d
 install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d
 install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{name}/greenboot.conf
+install -DpZm 0644 etc/grub.d/greenboot.cfg %{buildroot}%{_sysconfdir}/grub.d/greenboot.cfg
 
 %post
 %systemd_post greenboot-healthcheck.service
@@ -91,6 +90,9 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
 %systemd_post greenboot-grub2-set-success.service
 %systemd_post greenboot-rpm-ostree-grub2-check-fallback.service
 %systemd_post redboot-auto-reboot.service
+if [ -d /usr/lib/bootupd/grub2-static/configs.d ]; then
+cp /etc/grub.d/greenboot.cfg /usr/lib/bootupd/grub2-static/configs.d
+fi
 
 %post default-health-checks
 %systemd_post greenboot-loading-message.service
@@ -119,6 +121,9 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
 %systemd_postun greenboot-grub2-set-counter.service
 %systemd_postun greenboot-grub2-set-success.service
 %systemd_postun greenboot-rpm-ostree-grub2-check-fallback.service
+if [ -f /usr/lib/bootupd/grub2-static/configs.d/greenboot.cfg ]; then
+rm -f /usr/lib/bootupd/grub2-static/configs.d/greenboot.cfg
+fi
 
 %postun default-health-checks
 %systemd_postun greenboot-loading-message.service
@@ -143,7 +148,7 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
 %dir %{_prefix}/lib/%{name}/red.d
 %{_exec_prefix}/lib/motd.d/boot-status
 %{_tmpfilesdir}/greenboot-status-motd.conf
-%{_prefix}/lib/bootupd/grub2-static/configs.d/*.cfg
+%{_sysconfdir}/grub.d/*.cfg
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/%{name}
 %{_libexecdir}/%{name}/greenboot-grub2-set-success