From 5e6d3a273d49dce62a24d35627f4e2a6155a4875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 14 Jul 2015 23:27:03 +0200 Subject: [PATCH] Prevent installing all the qubes packages in the installer image Split kernel-install hook into separate package, as only this part is needed by the installer. This will prevent installing all the Qubes/Xen staff in the installer, especially udev scripts and xenstored, which doesn't play well with anaconda. --- rpm_spec/core-dom0-linux.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec index 7f86400..320ce23 100644 --- a/rpm_spec/core-dom0-linux.spec +++ b/rpm_spec/core-dom0-linux.spec @@ -47,7 +47,7 @@ BuildRequires: qubes-utils-devel >= 2.0.5 BuildRequires: qubes-libvchan-devel Requires: qubes-core-dom0 Requires: qubes-utils >= 2.0.6 -Provides: %{name}-kernel-install +Requires: %{name}-kernel-install %define _builddir %(pwd) @@ -56,6 +56,12 @@ Linux customizations required to use system as Qubes dom0. Additionally some graphical elements for every Linux desktop envirnment (icons, appmenus etc). +%package kernel-install +Summary: Kernel install hook for Xen-based system + +%description kernel-install +Kernel install hook for Xen-based system. + %prep # we operate on the current directory, so no need to unpack anything # symlink is to generate useful debuginfo packages @@ -249,7 +255,6 @@ chmod -x /etc/grub.d/10_linux /usr/lib64/pm-utils/sleep.d/52qubes-pause-vms /usr/lib/systemd/system/qubes-suspend.service # Others -/usr/lib/kernel/install.d/90-grub2.install /etc/sysconfig/modules/qubes-dom0.modules /etc/sysconfig/modules/cpufreq-xen.modules /etc/sudoers.d/qubes @@ -263,5 +268,7 @@ chmod -x /etc/grub.d/10_linux %{_mandir}/man1/qvm-*.1* %{_mandir}/man1/qubes-*.1* +%files kernel-install +/usr/lib/kernel/install.d/90-grub2.install %changelog