.gitignore

@@ -1 +1 @@
-SOURCES/v0.14.0.tar.gz
+SOURCES/v0.15.6.tar.gz

.greenboot.metadata

@@ -1 +1 @@
-6c94c4e8961505c4b704248f77ed76f20892cd4d SOURCES/v0.14.0.tar.gz
+0eda66a3f0c51817195d38109a1aab992fbe1345 SOURCES/v0.15.6.tar.gz

SPECS/greenboot.spec

@@ -1,10 +1,10 @@
 %global debug_package %{nil}
 
 Name:               greenboot
-Version:            0.14.0
+Version:            0.15.6
-Release:            3%{?dist}
+Release:            2%{?dist}
 Summary:            Generic Health Check Framework for systemd
-License:            LGPLv2+
+License:            LGPL-2.1-or-later
 
 %global repo_owner  fedora-iot
 %global repo_name   %{name}
@@ -16,12 +16,12 @@ Source0:            https://github.com/%{repo_owner}/%{repo_name}/archive/%{repo
 ExcludeArch: s390x
 BuildRequires:      systemd-rpm-macros
 %{?systemd_requires}
-Requires:           systemd
+Requires:           systemd >= 240
 Requires:           grub2-tools-minimal
 Requires:           rpm-ostree
 # 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
+Requires:           pam >= 1.4.0
 # While not strictly necessary to generate the motd, the main use-case of this package is to display it on SSH login
 Recommends:         openssh
 Provides:           greenboot-auto-update-fallback
@@ -76,6 +76,8 @@ install -DpZm 0644 usr/lib/systemd/system/*.service %{buildroot}%{_unitdir}
 install -DpZm 0644 usr/lib/tmpfiles.d/greenboot-status-motd.conf %{buildroot}%{_tmpfilesdir}/greenboot-status-motd.conf
 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
@@ -88,6 +90,9 @@ install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib
 %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
@@ -116,21 +121,23 @@ install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib
 %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
 
 %files
-%doc README.md
 %license LICENSE
-%dir %{_libexecdir}/%{name}
+%doc README.md
-%{_libexecdir}/%{name}/%{name}
+%dir %{_sysconfdir}/%{name}
-%{_libexecdir}/%{name}/greenboot-loading-message
+%dir %{_sysconfdir}/%{name}/check
-%{_unitdir}/greenboot-healthcheck.service
+%dir %{_sysconfdir}/%{name}/check/required.d
-%{_unitdir}/greenboot-loading-message.service
+%dir %{_sysconfdir}/%{name}/check/wanted.d
-%{_unitdir}/greenboot-task-runner.service
+%dir %{_sysconfdir}/%{name}/green.d
-%{_unitdir}/redboot-task-runner.service
+%dir %{_sysconfdir}/%{name}/red.d
-%{_unitdir}/redboot.target
+%config(noreplace) %{_sysconfdir}/%{name}/greenboot.conf
 %dir %{_prefix}/lib/%{name}
 %dir %{_prefix}/lib/%{name}/check
 %dir %{_prefix}/lib/%{name}/check/required.d
@@ -139,23 +146,28 @@ install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib
 %{_prefix}/lib/%{name}/check/wanted.d/00_wanted_scripts_start.sh
 %dir %{_prefix}/lib/%{name}/green.d
 %dir %{_prefix}/lib/%{name}/red.d
-%dir %{_sysconfdir}/%{name}
-%dir %{_sysconfdir}/%{name}/check
-%dir %{_sysconfdir}/%{name}/check/required.d
-%dir %{_sysconfdir}/%{name}/check/wanted.d
-%dir %{_sysconfdir}/%{name}/green.d
-%dir %{_sysconfdir}/%{name}/red.d
 %{_exec_prefix}/lib/motd.d/boot-status
-%{_libexecdir}/%{name}/greenboot-status
 %{_tmpfilesdir}/greenboot-status-motd.conf
-%{_unitdir}/greenboot-status.service
+%{_sysconfdir}/grub.d/*.cfg
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/%{name}
+%{_libexecdir}/%{name}/greenboot-grub2-set-success
+%{_libexecdir}/%{name}/greenboot-boot-remount
 %{_libexecdir}/%{name}/greenboot-grub2-set-counter
-%{_unitdir}/greenboot-grub2-set-success.service
+%{_libexecdir}/%{name}/greenboot-loading-message
-%{_unitdir}/greenboot-grub2-set-counter.service
+%{_libexecdir}/%{name}/greenboot-status
 %{_libexecdir}/%{name}/greenboot-rpm-ostree-grub2-check-fallback
-%{_unitdir}/greenboot-rpm-ostree-grub2-check-fallback.service
 %{_libexecdir}/%{name}/redboot-auto-reboot
+%{_unitdir}/greenboot-grub2-set-counter.service
+%{_unitdir}/greenboot-grub2-set-success.service
+%{_unitdir}/greenboot-healthcheck.service
+%{_unitdir}/greenboot-loading-message.service
+%{_unitdir}/greenboot-status.service
+%{_unitdir}/greenboot-task-runner.service
+%{_unitdir}/greenboot-rpm-ostree-grub2-check-fallback.service
+%{_unitdir}/redboot.target
 %{_unitdir}/redboot-auto-reboot.service
+%{_unitdir}/redboot-task-runner.service
 
 %files default-health-checks
 %{_prefix}/lib/%{name}/check/required.d/01_repository_dns_check.sh
@@ -164,52 +176,69 @@ install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib
 %{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh
 
 %changelog
-* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 0.14.0-3
+* Tue Sep 17 2024 saypaul <paul.sayan@gmail.com> - 0.15.6-2
-- Rebuilt for MSVSphere 8.8
+- Update to 0.15.6-2
+
+* Tue Sep 10 2024 Paul Whalen <pwhalen@fedoraproject.org> - 0.15.6-1
+- Update to 0.15.6
+
+* Tue Sep 10 2024 Paul Whalen <pwhalen@fedoraproject.org> - 0.15.5-3
+- Moved greenboot config to /etc/grub.d.
+- %post symlink greenboot.cfg to bootupd if present
+- %postun remove symlink from bootupd if present
+
+* Thu Aug 22 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 0.15.5-2
+- Reorder files, don't overwrite configs on update
 
-* Tue Jan 18 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 0.14.0-3
+* Fri Aug 16 2024 saypaul <paul.sayan@gmail.com> - 0.15.5-1
-- Obsolete greenboot-status
+- The 0.15.5 release
+- Auto-detect image type and use correct rollback
+- Support for read only /boot mount
+- Warn users of missing disabled healthchecks
+- Add feature to disable healthchecks
 
-* Wed Dec 15 2021 Peter Robinson <pbrobinson@redhat.com> - 0.14.0-2
+* Fri Feb 17 2023 Paul Whalen <pwhalen@fedoraproject.org> - 0.15.4-1
-- Fix systemd version
+- The 0.15.4 release
+- Fix update_platforms_check script 
 
-* Thu Nov 18 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 0.14.0-1
+* Mon Nov 28 2022 Paul Whalen <pwhalen@fedoraproject.org> - 0.15.3-1
-- Release 0.14.0 (Peter Robinson)
+- The 0.15.3 release
-- Updated testing documentation (Jose Noguera)
+- revert service-monitor
-- README updated with TOC and improved explanations (Jose Noguera)
-- Add watchdog-triggered boot check #2 (Jose Noguera)
-- Update specfile and README to reflect changes in subpackage layout. (Jose Noguera)
-- Ensure all required health checks are run #52 (Jose Noguera)
 
-* Wed Nov 10 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 0.13.1-1
+* Thu Sep 08 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 0.15.2-1
-- tag 0.31.1 (Peter Robinson)
+- The 0.15.2 release
+
+* Tue Aug 09 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 0.15.1-1
+- Add conf during installation
+
+* Thu Jul 21 2022 Sayan Paul <saypaul@fedoraproject.org> - 0.15.0-1
+- The 0.15.0 release
+- Add service-monitor
+
+* Thu Nov 18 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 0.14.0-1
+- The 0.14.0 release
+- Add watchdog-triggered boot check
+- Ensure all required health checks are run
+
+* Wed Nov 10 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 0.13.1-1
+- Update to 0.13.1
 
 * Mon Jul 26 2021 Jose Noguera <jnoguera@redhat.com> - 0.12.0-1
 - Update to 0.12.0
 - Add ability to configure maximum number of boot attempts via env var and config file.
 - Add How does it work section to README.
 - Add CI via GitHub Actions and unit testing with BATS.
-- Add update platforms DNS resolutiona and connection checker as health checks out of the box
+- Add update platforms DNS resolution and connection checker as health checks out of the box
 
 * Sat Jan 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 0.11.0-2
 - Make arch specific due to grub availability on s390x
 - Resolves: rhbz#1915241
 
-* Thu Aug 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.11-1
+* Thu Aug 13 2020 Christian Glombek <lorbus@fedoraproject.org> - 0.11.0-1
 - Update to 0.11.0
-- Resolves: rhbz#1815140
-
-* Thu Jul 23 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10.3-5
-- Make package arch specific to work around lack of grub2 on s390x
-- Resolves: rhbz#1815140
-
-* Thu Jun 11 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10.3-3
-- Make motd status page optional
-- Resolves: rhbz#1815140
 
 * Thu Jun 11 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10.3-2
 - Update changelog
-- Resolves: rhbz#1815140
 
 * Fri Jun 05 2020 Christian Glombek <lorbus@fedoraproject.org> - 0.10.3-1
 - Update to 0.10.3