fix: remove bootupd #152
+9
−4
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| Name: greenboot | ||
| Version: 0.15.5 | ||
| 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 | ||
| # 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 | ||
| 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 | ||
| %{_sysconfdir}/grub.d/*.cfg | ||
|
There was a problem hiding this comment. This is an unrelated fix, it should be in a different commit/PR. There was a problem hiding this comment. I think you saw comparison between two commits, which made it seem unrelated. https://github.com/fedora-iot/greenboot/pull/152/files#r1747377644 |
||
| %dir %{_libexecdir}/%{name} | ||
| %{_libexecdir}/%{name}/%{name} | ||
| %{_libexecdir}/%{name}/greenboot-grub2-set-success | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope! This is not going to work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can't move package files around in post scripts, it means for example the rpm won't verify properly for one, and it's also extremely prone to errors and interruptions. Also if someone does custom image it may well break.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nullr0ute do you have any suggestions for conditionalizing where the grub config lands as Sayan is trying to do?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The general rule of thumb is that you shouldn't do it. I think we need to step back and look at the actual problem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I applied a hard link instead of mv also added in %postun to remove the ln post remove.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a chance that /etc would be mounted on a different flesystem?
Is symlink better for what we're trying to do?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thats a good point, hardlink will have issue between different file systems, softlink didn't work so I plan on using
cpas it may not have an integrity issue as pointed out by @nullr0ute