rpms/grub2
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-24 06:22:43 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Remove [Install] section from aux systemd units

Browse source 
Related: #2247635
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
This commit is contained in:
Nicolas Frayer 2023-11-14 15:56:01 +01:00
parent 94ecc476ab
commit 88924af554
3 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
0340-Remove-Install-section-from-aux-systemd-units.patch Normal file
View file

@ -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

1
grub.patches
View file

@ -337,3 +337,4 @@ Patch0336: 0336-arm64-Use-proper-memory-type-for-kernel-allocation.patch
Patch0337: 0337-Fix-missing-include-in-ofdisk.c.patch Patch0337: 0337-Fix-missing-include-in-ofdisk.c.patch
Patch0338: 0338-kern-ieee1275-init-ppc64-Restrict-high-memory-in-pre.patch Patch0338: 0338-kern-ieee1275-init-ppc64-Restrict-high-memory-in-pre.patch
Patch0339: 0339-grub-install-on-EFI-if-forced.patch Patch0339: 0339-grub-install-on-EFI-if-forced.patch
Patch0340: 0340-Remove-Install-section-from-aux-systemd-units.patch

6
grub2.spec
View file

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 107%{?dist} Release: 108%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -555,6 +555,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %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 * 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: Switch back to static enablement for grub services in tools package
- spec: Add %%triggerpostun to apply grub-boot-success.timer preset - spec: Add %%triggerpostun to apply grub-boot-success.timer preset