From 28ae00e00725a87b83a000ac5c4e6d1ef89ca260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 25 Nov 2024 14:02:04 +0100
Subject: [PATCH] rpm: use the install target in boot/Makefile

Fix the target to install file into /etc/default (it's not grub.d file).
And then don't open-code it in the spec file.
No functional change.

(cherry picked from commit 33e30a1b2909403d9ad9a5390d995116e4ab22e6)
---
 boot/Makefile               | 5 +++--
 rpm_spec/core-agent.spec.in | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/boot/Makefile b/boot/Makefile
index 7cb97ff57..c9b4123f2 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -1,10 +1,11 @@
 LIBDIR ?= /usr/lib
 SYSCONFDIR ?= /etc
-GRUBCONFDIR ?= $(SYSCONFDIR)/grub.d
+GRUBCONFDIR ?= $(SYSCONFDIR)/default
 DRACUTCONFDIR ?= $(LIBDIR)/dracut/dracut.conf.d
+GRUBCFGNAME ?= grub.qubes
 
 .PHONY: install
 
 install:
-	install -D -m 0644 grub.qubes $(DESTDIR)$(GRUBCONFDIR)/30_qubes
+	install -D -m 0644 grub.qubes $(DESTDIR)$(GRUBCONFDIR)/$(GRUBCFGNAME)
 	install -D -m 0644 dracut-qubes.conf $(DESTDIR)$(DRACUTCONFDIR)/30-qubes.conf
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 69cf3b5ee..397940a25 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -487,6 +487,7 @@ usermod -L root
 
 make install-vm PYTHON=%{__python3} "DESTDIR=$RPM_BUILD_ROOT" SYSTEM_DROPIN_DIR=%{_unitdir} SYSLIBDIR=/usr/lib ENABLE_SELINUX=%with_selinux
 make -C app-menu DESTDIR=$RPM_BUILD_ROOT install
+make -C boot DESTDIR=$RPM_BUILD_ROOT install
 make -C boot/redhat DESTDIR=$RPM_BUILD_ROOT install
 make -C config-overrides DESTDIR=$RPM_BUILD_ROOT install
 make -C filesystem DESTDIR=$RPM_BUILD_ROOT install
@@ -520,9 +521,6 @@ sed -i \
         $RPM_BUILD_ROOT/etc/yum.repos.d/qubes-*.repo
 %endif
 
-install -D -m 0644 boot/dracut-qubes.conf $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d/30-qubes.conf
-install -D -m 0644 boot/grub.qubes $RPM_BUILD_ROOT/etc/default/grub.qubes
-
 %if ! %with_sysvinit
     rm -rf $RPM_BUILD_ROOT/etc/init.d/qubes-* $RPM_BUILD_ROOT/etc/sysconfig/modules/qubes-core.modules
 %endif