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

anaconda/installclasses/qubes.py

@@ -95,10 +95,8 @@ class InstallClass(BaseInstallClass):
         subprocess.check_call(['/usr/sbin/chroot', anaconda.rootPath,
             '/bin/bash', '-c', 'rpm --import /etc/pki/rpm-gpg/*'])
 
-        # Fix default initramfs (anaconda generates own one...)
+        subprocess.check_call(['/usr/sbin/chroot', anaconda.rootPath,
-        for kernel in anaconda.backend.kernelVersionList(anaconda.rootPath):
+            '/sbin/dracut', '--force', '/boot/initramfs-' + kernel[0] + '.img'])
-            subprocess.check_call(['/usr/sbin/chroot', anaconda.rootPath,
-                        '/usr/lib/qubes/regenerate_initramfs.sh', kernel[0]])
 
     def getBackend(self):
         if flags.livecdInstall: