Merge pull request #214 from champtar/bootupd-grub2-static-ordering

Bootupd grub2 static ordering

Author: say-paul

greenboot.spec

@@ -69,6 +69,7 @@ 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/08_greenboot.cfg
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_unitdir}/greenboot-healthcheck.service.d
 mkdir -p %{buildroot}%{_tmpfilesdir}
@@ -81,7 +82,6 @@ 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
@@ -94,9 +94,6 @@ install -DpZm 0644 etc/grub.d/greenboot.cfg %{buildroot}%{_sysconfdir}/grub.d/gr
 %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
@@ -125,9 +122,6 @@ fi
 %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
@@ -152,7 +146,7 @@ fi
 %dir %{_prefix}/lib/%{name}/red.d
 %{_exec_prefix}/lib/motd.d/boot-status
 %{_tmpfilesdir}/greenboot-status-motd.conf
-%{_sysconfdir}/grub.d/*.cfg
+%{_prefix}/lib/bootupd/grub2-static/configs.d/*.cfg
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/%{name}
 %{_libexecdir}/%{name}/greenboot-grub2-set-success