From 7fd011fd9feb451cfc3ed6a5c356fa9c39e43a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 5 Jan 2023 00:26:57 +0100 Subject: [PATCH] Sync VM initramfs settings with qubes-prepare-vm-kernel (cherry picked from commit 8ab3d0f9ac5b6d74b439392754e401c1cd443a47) --- kernel.spec.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel.spec.in b/kernel.spec.in index 5d27c3e7..3fa42893 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -58,6 +58,7 @@ AutoReqProv: on BuildRequires: coreutils module-init-tools sparse BuildRequires: qubes-kernel-vm-support BuildRequires: dracut +BuildRequires: busybox BuildRequires: bc BuildRequires: openssl BuildRequires: openssl-devel @@ -473,9 +474,10 @@ mv %buildroot/lib/firmware-all %buildroot/lib/firmware/%kernelrelease # Prepare initramfs for Qubes VM mkdir -p %buildroot/%vm_install_dir -PATH="/sbin:$PATH" dracut --nomdadmconf --nolvmconf \ +PATH="/sbin:$PATH" dracut --nomdadmconf --nolvmconf --no-hostonly \ --kmoddir %buildroot/lib/modules/%kernelrelease \ - --modules "kernel-modules qubes-vm-simple" \ + --modules "kernel-modules qubes-vm-simple busybox" \ + --omit "nss-softokn extra-modules qubes-pciback qubes-udev" \ --conf /dev/null --confdir /var/empty \ -d "xenblk xen-blkfront cdrom ext4 jbd2 crc16 dm_snapshot" \ %buildroot/%vm_install_dir/initramfs %kernelrelease