diff --git a/.gitignore b/.gitignore index bf8a3cc..cb3eda6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v0.14.0.tar.gz +v0.15.8.tar.gz diff --git a/.greenboot.metadata b/.greenboot.metadata deleted file mode 100644 index d83a68e..0000000 --- a/.greenboot.metadata +++ /dev/null @@ -1 +0,0 @@ -6c94c4e8961505c4b704248f77ed76f20892cd4d SOURCES/v0.14.0.tar.gz diff --git a/SPECS/greenboot.spec b/greenboot.spec similarity index 51% rename from SPECS/greenboot.spec rename to greenboot.spec index 60afa0d..2cdcc92 100644 --- a/SPECS/greenboot.spec +++ b/greenboot.spec @@ -1,10 +1,10 @@ %global debug_package %{nil} Name: greenboot -Version: 0.14.0 -Release: 3%{?dist} +Version: 0.15.8 +Release: 1%{?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} @@ -13,15 +13,15 @@ License: LGPLv2+ URL: https://github.com/%{repo_owner}/%{repo_name} Source0: https://github.com/%{repo_owner}/%{repo_name}/archive/%{repo_tag}.tar.gz -ExcludeArch: s390x +ExcludeArch: s390x {%ix86} 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} -%{_libexecdir}/%{name}/%{name} -%{_libexecdir}/%{name}/greenboot-loading-message -%{_unitdir}/greenboot-healthcheck.service -%{_unitdir}/greenboot-loading-message.service -%{_unitdir}/greenboot-task-runner.service -%{_unitdir}/redboot-task-runner.service -%{_unitdir}/redboot.target +%doc README.md +%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 +%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 -%{_unitdir}/greenboot-grub2-set-counter.service +%{_libexecdir}/%{name}/greenboot-loading-message +%{_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,49 +176,161 @@ install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib %{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh %changelog -* Tue Jan 18 2022 Peter Robinson - 0.14.0-3 -- Obsolete greenboot-status +* Wed Feb 26 2025 Antonio Murdaca - 0.15.8-1 +## What's Changed + * ci: add ci test for pull request by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/164 + * ci: add more wait time for fallback by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/167 + * ci: fix ansible check failure by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/169 + * ci: add test case of bootc anaconda iso by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/171 + * test github token by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/174 + * update github action by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/177 + * Update greenboot-ci.yaml by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/179 + * ci: fix iso case failure by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/173 + * ci: add support for fedora rawhide by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/181 + * ci: fix rahide failure by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/183 + * ci: fix podman retry issue by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/185 + * ci: add centos-stream-9 support by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/187 + * ci: add rhel 9.6 support by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/190 + * ci: fix rhel 9.6 anaconda case failure by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/193 + * ci: fix secret error by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/195 + * specfile: Stop building on ix86 by @travier in https://github.com/fedora-iot/greenboot/pull/197 + * rollback: if no bootc, fallback to rpm-ostree by @runcom in https://github.com/fedora-iot/greenboot/pull/199 + * fix:fail early for any required script failure by @say-paul in https://github.com/fedora-iot/greenboot/pull/198 + * Release 0.15.8 by @runcom in https://github.com/fedora-iot/greenboot/pull/202 -* Wed Dec 15 2021 Peter Robinson - 0.14.0-2 -- Fix systemd version +## New Contributors + * @travier made their first contribution in https://github.com/fedora-iot/greenboot/pull/197 -* Thu Nov 18 2021 Packit Service - 0.14.0-1 -- Release 0.14.0 (Peter Robinson) -- Updated testing documentation (Jose Noguera) -- 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) + **Full Changelog**: https://github.com/fedora-iot/greenboot/compare/v0.15.7...v0.15.8 +- Resolves: RHEL-78242 -* Wed Nov 10 2021 Packit Service - 0.13.1-1 -- tag 0.31.1 (Peter Robinson) +* Thu Oct 31 2024 Sayan Paul - 0.15.7-1 +- Update to 0.15.7 +- Reword warning message for disabled checks +- Fixed the issue that boot_counter cannot be unset and some scripts do not have executable permissions +- Packit: only use IoT relevant branches + +* Tue Sep 17 2024 saypaul - 0.15.6-2 +- Update to 0.15.6-2 + +* Tue Sep 10 2024 Paul Whalen - 0.15.6-1 +- Update to 0.15.6 + +* Tue Oct 29 2024 Troy Dawson - 0.15.5-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Thu Aug 22 2024 Peter Robinson - 0.15.5-2 +- Reorder files, don't overwrite configs on update + +* Fri Aug 16 2024 Sayan Paul - 0.15.5-1 +- 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 + +* Fri Feb 17 2023 Paul Whalen - 0.15.4-1 +- The 0.15.4 release +- Fix update_platforms_check script + +* Mon Nov 28 2022 Paul Whalen - 0.15.3-1 +- The 0.15.3 release +- revert service-monitor + +* Thu Sep 08 2022 Peter Robinson - 0.15.2-1 +- The 0.15.2 release + +* Mon Jun 24 2024 Troy Dawson - 0.15.4-6 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 0.15.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 0.15.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 27 2023 Peter Robinson - 0.15.4-3 +- migrated to SPDX license + +* Thu Jul 20 2023 Fedora Release Engineering - 0.15.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Feb 20 2023 Packit - 0.15.4-1 +- Release v0.15.4 (Paul Whalen) +- checks: update assignment of platform URLs var (Micah Abbott) +- Revert "update_platforms_check: quote array for ShellCheck fix" (Micah Abbott) +- Update README.md (alcir) + +* Thu Jan 19 2023 Fedora Release Engineering - 0.15.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 29 2022 Packit - 0.15.3-1 +- Release 0.15.3 (Paul Whalen) +- packit: add koji, bodhi jobs, upstream url (Paul Whalen) +- packit.yaml: Fix deprecated and renamed keys. (Paul Whalen) +- greenboot: fix exit status with unknown argument (Paul Whalen) +- greenboot-grub2-set-counter.service: ensure /boot is mounted (Adam Williamson) +- check-fallbback: ShellCheck fix (Micah Abbott) +- greenboot-grub2-set-counter: ShellCheck fix (Micah Abbott) +- greenboot-status: fix or statements to default to true (Micah Abbott) +- update_platforms_check: quote array for ShellCheck fix (Micah Abbott) +- watchdog.sh: ShellCheck fixes (Micah Abbott) +- add shellcheck GH action (Micah Abbott) +- Revert "disable DefaultDependencies to fix cycle error" (Antonio Murdaca) +- Revert "Add greenboot-service-monitor.service for service health checking" (Antonio Murdaca) + +* Fri Sep 23 2022 Adam Williamson - 0.15.2-2 +- Backport PR #84 to fix RHBZ #2121944 + +* 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 + +* Tue Aug 09 2022 Peter Robinson - 0.15.1-1 +- Add conf during installation + +* Thu Jul 21 2022 Sayan Paul - 0.15.0-1 +- The 0.15.0 release +- Add service-monitor + +* Thu Jul 21 2022 Fedora Release Engineering - 0.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Nov 18 2021 Peter Robinson - 0.14.0-1 +- The 0.14.0 release +- Add watchdog-triggered boot check +- Ensure all required health checks are run + +* Thu Nov 18 2021 Peter Robinson - 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 - 0.13.1-1 +- Update to 0.13.1 * Mon Jul 26 2021 Jose Noguera - 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 - 0.11.0-2 - Make arch specific due to grub availability on s390x - Resolves: rhbz#1915241 -* Thu Aug 20 2020 Peter Robinson - 0.11-1 +* Thu Aug 13 2020 Christian Glombek - 0.11.0-1 - Update to 0.11.0 -- Resolves: rhbz#1815140 - -* Thu Jul 23 2020 Peter Robinson - 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 - 0.10.3-3 -- Make motd status page optional -- Resolves: rhbz#1815140 * Thu Jun 11 2020 Peter Robinson - 0.10.3-2 - Update changelog -- Resolves: rhbz#1815140 * Fri Jun 05 2020 Christian Glombek - 0.10.3-1 - Update to 0.10.3 @@ -246,4 +370,4 @@ install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib - Spec Review * Thu Jun 14 2018 Christian Glombek - 0.4-1 -- Initial Package +- Initial Package \ No newline at end of file diff --git a/sources b/sources new file mode 100644 index 0000000..ffe595d --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (v0.15.8.tar.gz) = 5277a879a6ed4073b5368e635a1a1f44d4b0ea9037eafea637e8740f287050f385540b3b8c127703761992352e3024c946ba7fb1120c9851c2e547315986d2b2