From ed6ab1e598fa34fef5cdd5ba0003cccc3572a5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 10 Jul 2015 17:54:24 +0200 Subject: [PATCH] Add kernel post-installation script to regenerate grub2 config Since we now allow using Fedora kernel, add a script to generate proper bootloader configuration then. Standard Fedora mechanism relies on Boot Loader Specification support in grub2, which sadly does not support Xen, so it is useless in Qubes. (cherry picked from commit 2a14ae9c0bbe056ec90757bf269363153fc32281) Conflicts: rpm_spec/core-dom0-linux.spec --- rpm_spec/core-dom0-linux.spec | 2 ++ system-config/kernel-grub2.install | 3 +++ 2 files changed, 5 insertions(+) create mode 100755 system-config/kernel-grub2.install diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec index ac5f244..e7ddae8 100644 --- a/rpm_spec/core-dom0-linux.spec +++ b/rpm_spec/core-dom0-linux.spec @@ -144,6 +144,7 @@ install -d $RPM_BUILD_ROOT/etc/udev/rules.d install -m 644 system-config/00-qubes-ignore-devices.rules $RPM_BUILD_ROOT/etc/udev/rules.d/ install -m 644 system-config/60-persistent-storage.rules $RPM_BUILD_ROOT/etc/udev/rules.d/ install -m 644 -D system-config/disable-lesspipe $RPM_BUILD_ROOT/etc/profile.d/zz-disable-lesspipe +install -m 755 -D system-config/kernel-grub2.install $RPM_BUILD_ROOT/usr/lib/kernel/install.d/90-grub2.install ### Icons mkdir -p $RPM_BUILD_ROOT/usr/share/qubes/icons @@ -255,6 +256,7 @@ chmod -x /etc/grub.d/10_linux # Others /etc/sysconfig/iptables /etc/sysconfig/ip6tables +/usr/lib/kernel/install.d/90-grub2.install /etc/sysconfig/modules/qubes-dom0.modules /etc/sysconfig/modules/cpufreq-xen.modules /etc/sudoers.d/qubes diff --git a/system-config/kernel-grub2.install b/system-config/kernel-grub2.install new file mode 100755 index 0000000..97c3e01 --- /dev/null +++ b/system-config/kernel-grub2.install @@ -0,0 +1,3 @@ +#!/bin/sh + +grub2-mkconfig -o /boot/grub2/grub.cfg