diff --git a/kernel-xenlinux.spec b/kernel-xenlinux.spec index 62c32bd..25f1e7d 100644 --- a/kernel-xenlinux.spec +++ b/kernel-xenlinux.spec @@ -287,9 +287,8 @@ fi mkdir -p %buildroot/%vm_install_dir /sbin/dracut --nomdadmconf --nolvmconf \ --kmoddir %buildroot/lib/modules/%kernelrelease \ - --include %_sourcedir/vm-initramfs-pre-udev /pre-udev \ - --include %_sourcedir/vm-initramfs-pre-pivot /pre-pivot \ - --add-drivers xenblk \ + --include %_sourcedir/vm-initramfs / \ + -d "xenblk cdrom ext4 jbd2 crc16 dm_snapshot" \ %buildroot/%vm_install_dir/initramfs %kernelrelease cp -p arch/x86/boot/vmlinuz %buildroot/%vm_install_dir/vmlinuz diff --git a/vm-initramfs-pre-pivot/50_mount_modules.sh b/vm-initramfs/pre-pivot/50_mount_modules.sh similarity index 100% rename from vm-initramfs-pre-pivot/50_mount_modules.sh rename to vm-initramfs/pre-pivot/50_mount_modules.sh diff --git a/vm-initramfs-pre-udev/90_qubes_cow_setup.sh b/vm-initramfs/pre-udev/90_qubes_cow_setup.sh similarity index 100% rename from vm-initramfs-pre-udev/90_qubes_cow_setup.sh rename to vm-initramfs/pre-udev/90_qubes_cow_setup.sh