#26 Use presets and macros to enable systemd units in tools
Opened 13 days ago by lorbus. Modified 13 days ago
rpms/ lorbus/grub2 use-presets-and-macros  into  rawhide

file modified
+10 -12
@@ -271,17 +271,8 @@ 

  # Install systemd user service to set the boot_success flag

  install -D -m 0755 -t %{buildroot}%{_userunitdir} \

  	docs/grub-boot-success.{timer,service}

- install -d -m 0755 %{buildroot}%{_userunitdir}/timers.target.wants

- ln -s ../grub-boot-success.timer \

- 	%{buildroot}%{_userunitdir}/timers.target.wants

  # Install systemd system-update unit to set boot_indeterminate for offline-upd

  install -D -m 0755 -t %{buildroot}%{_unitdir} docs/grub-boot-indeterminate.service

- install -d -m 0755 %{buildroot}%{_unitdir}/system-update.target.wants

- install -d -m 0755 %{buildroot}%{_unitdir}/reboot.target.wants

- ln -s ../grub-boot-indeterminate.service \

- 	%{buildroot}%{_unitdir}/system-update.target.wants

- ln -s ../grub2-systemd-integration.service \

- 	%{buildroot}%{_unitdir}/reboot.target.wants

  

  # Don't run debuginfo on all the grub modules and whatnot; it just

  # rejects them, complains, and slows down extraction.
@@ -332,6 +323,16 @@ 

      fi

  fi

  

+ %post tools

+ %systemd_post grub-boot-indeterminate.service

+ %systemd_post grub-systemd-integration.service

+ %systemd_user_post grub-boot-success.timer

+ 

+ %preun tools

+ %systemd_preun grub-boot-indeterminate.service

+ %systemd_preun grub-systemd-integration.service

+ %systemd_user_preun grub-boot-success.timer

+ 

  %posttrans common

  set -eu

  
@@ -427,11 +428,8 @@ 

  %{_sysconfdir}/grub.d/README

  %{_userunitdir}/grub-boot-success.timer

  %{_userunitdir}/grub-boot-success.service

- %{_userunitdir}/timers.target.wants

  %{_unitdir}/grub-boot-indeterminate.service

- %{_unitdir}/system-update.target.wants

  %{_unitdir}/grub2-systemd-integration.service

- %{_unitdir}/reboot.target.wants

  %{_unitdir}/systemd-logind.service.d

  %{_infodir}/grub2*

  %{_datarootdir}/grub/*

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/7b6518ede1564984ac838839bd6db525

rebased onto 1bbb506

13 days ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/73d1ccfe747743a798ce61a0c2a04af1

Metadata