#42 Remove [Install] section from aux systemd units
Merged 7 months ago by nfrayer. Opened 7 months ago by nfrayer.
rpms/ nfrayer/grub2 rawhide  into  rawhide

@@ -0,0 +1,33 @@ 

+ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

+ From: Christian Glombek <cglombek@redhat.com>

+ Date: Tue, 14 Nov 2023 07:54:59 +0100

+ Subject: [PATCH] Remove [Install] section from aux systemd units

+ 

+ See https://bugzilla.redhat.com/show_bug.cgi?id=2247635#c7

+ ---

+  docs/grub-boot-indeterminate.service             | 3 ---

+  util/systemd/grub-systemd-integration.service.in | 3 ---

+  2 files changed, 6 deletions(-)

+ 

+ diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service

+ index 5bcb474a3d31..6c8dcb186b63 100644

+ --- a/docs/grub-boot-indeterminate.service

+ +++ b/docs/grub-boot-indeterminate.service

+ @@ -9,6 +9,3 @@ Before=system-update-pre.target

+  [Service]

+  Type=oneshot

+  ExecStart=/usr/bin/grub2-editenv - incr boot_indeterminate

+ -

+ -[Install]

+ -WantedBy=system-update.target

+ diff --git a/util/systemd/grub-systemd-integration.service.in b/util/systemd/grub-systemd-integration.service.in

+ index 22ca1ca4885e..c81fb594ce17 100644

+ --- a/util/systemd/grub-systemd-integration.service.in

+ +++ b/util/systemd/grub-systemd-integration.service.in

+ @@ -6,6 +6,3 @@ ConditionPathExists=/run/systemd/reboot-to-boot-loader-menu

+  

+  [Service]

+  ExecStart=@libexecdir@/@grubdirname@/systemd-integration.sh

+ -

+ -[Install]

+ -WantedBy=reboot.target

file modified
+1
@@ -337,3 +337,4 @@ 

  Patch0337: 0337-Fix-missing-include-in-ofdisk.c.patch

  Patch0338: 0338-kern-ieee1275-init-ppc64-Restrict-high-memory-in-pre.patch

  Patch0339: 0339-grub-install-on-EFI-if-forced.patch

+ Patch0340: 0340-Remove-Install-section-from-aux-systemd-units.patch

file modified
+5 -1
@@ -17,7 +17,7 @@ 

  Name:		grub2

  Epoch:		1

  Version:	2.06

- Release:	107%{?dist}

+ Release:	108%{?dist}

  Summary:	Bootloader with support for Linux, Multiboot and more

  License:	GPLv3+

  URL:		http://www.gnu.org/software/grub/
@@ -555,6 +555,10 @@ 

  %endif

  

  %changelog

+ * Tue Nov 14 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-108

+ - Remove [Install] section from aux systemd units

+ - Related: #2247635

+ 

  * Tue Nov 14 2023 Hans de Goede <hdegoede@redhat.com> - 2.06-107

  - spec: Switch back to static enablement for grub services in tools package

  - spec: Add %%triggerpostun to apply grub-boot-success.timer preset

Related: #2247635
Signed-off-by: Nicolas Frayer nfrayer@redhat.com

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/3193c2bc3c774ef88d02062742d13212

Pull-Request has been merged by nfrayer

7 months ago