Merge remote-tracking branch 'qubesos/pr/3' into devel-4.1

* qubesos/pr/3: Remove checked in symlinks to fc20 from pkgs/ In fc23 dracut has moved to /usr/bin
8 years ago · 9e8eb99e8f
parent 77d6484c99 ceb3309147
commit 9e8eb99e8f
4 changed files with 1 additions and 4 deletions
--- a/kernel.spec
+++ b/kernel.spec
@ -322,7 +322,7 @@ mv  %buildroot/lib/firmware-all %buildroot/lib/firmware/%kernelrelease

 # Prepare initramfs for Qubes VM
 mkdir -p %buildroot/%vm_install_dir
-/sbin/dracut --nomdadmconf --nolvmconf \
+PATH="/sbin:$PATH" dracut --nomdadmconf --nolvmconf \
    --kmoddir %buildroot/lib/modules/%kernelrelease \
    --modules "kernel-modules qubes-vm-simple" \
    --conf /dev/null --confdir /var/empty \
--- a/pkgs/fc21
+++ b/pkgs/fc21
@ -1 +0,0 @@
-fc20
--- a/pkgs/fc22
+++ b/pkgs/fc22
@ -1 +0,0 @@
-fc20
--- a/pkgs/fc23
+++ b/pkgs/fc23
@ -1 +0,0 @@
-fc20