Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/kernel

kernel.spec

@@ -4,7 +4,8 @@
 
 #%define _unpackaged_files_terminate_build 0
 %define variant %{build_flavor}.qubes
-%define rel %(cat rel-%{build_flavor}).%{variant}
+%define plainrel %(cat rel-%{build_flavor})
+%define rel %{plainrel}.%{variant}
 %define version %(cat version-%{build_flavor})
 
 %define _buildshell /bin/bash
@@ -19,7 +20,7 @@
 %define build_src_dir %my_builddir/linux-%version
 %define src_install_dir /usr/src/kernels/%kernelrelease
 %define kernel_build_dir %my_builddir/linux-obj
-%define vm_install_dir /var/lib/qubes/vm-kernels/%version-%rel
+%define vm_install_dir /var/lib/qubes/vm-kernels/%version-%{plainrel}
 
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes})
 
@@ -436,7 +437,7 @@ umount /tmp/qubes-modules-%kernelrelease
 rmdir /tmp/qubes-modules-%kernelrelease
 mv /tmp/qubes-modules-%kernelrelease.img %vm_install_dir/modules.img
 
-qubes-prefs --set default-kernel %version
+qubes-prefs --set default-kernel %version-%plainrel
 
 %files qubes-vm
 %defattr(-, root, root)

vm-initramfs/pre-pivot

@@ -1 +0,0 @@
-lib/dracut/hooks/pre-pivot

vm-initramfs/pre-pivot/50_mount_modules.sh

@@ -0,0 +1 @@
+../lib/dracut/hooks/pre-pivot/50_mount_modules.sh

vm-initramfs/pre-udev

@@ -1 +0,0 @@
-lib/dracut/hooks/pre-udev

vm-initramfs/pre-udev/90_qubes_cow_setup.sh

@@ -0,0 +1 @@
+../lib/dracut/hooks/pre-udev/90_qubes_cow_setup.sh