From 97d0f39f38e1675b92dfd5f96e7e1e272b526cf5 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 9 Sep 2011 11:03:58 +0200 Subject: [PATCH 1/2] Revert "anaconda: Regenerate initramfs at the installation end" This reverts commit bf57b2a3f5e56ba2d453f53e42d3d476b63c670d. This script is not needed any more. Perhaps dracut should be called here directly, but I believe that anaconda does it automatically. Conflicts: anaconda/installclasses/qubes.py --- anaconda/installclasses/qubes.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/anaconda/installclasses/qubes.py b/anaconda/installclasses/qubes.py index d40a155..a3203c1 100644 --- a/anaconda/installclasses/qubes.py +++ b/anaconda/installclasses/qubes.py @@ -95,11 +95,6 @@ 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...) - for kernel in anaconda.backend.kernelVersionList(anaconda.rootPath): - subprocess.check_call(['/usr/sbin/chroot', anaconda.rootPath, - '/usr/lib/qubes/regenerate_initramfs.sh', kernel[0]]) - def getBackend(self): if flags.livecdInstall: import livecd From 1fe4aa8183259b29f5931ba33669f01c70dfe0ef Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 9 Sep 2011 11:23:02 +0200 Subject: [PATCH 2/2] anaconda: call dracut manually Anaconda does use own version, not from installed system (so without needed modules). --- anaconda/installclasses/qubes.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anaconda/installclasses/qubes.py b/anaconda/installclasses/qubes.py index a3203c1..df5e6e4 100644 --- a/anaconda/installclasses/qubes.py +++ b/anaconda/installclasses/qubes.py @@ -95,6 +95,9 @@ class InstallClass(BaseInstallClass): subprocess.check_call(['/usr/sbin/chroot', anaconda.rootPath, '/bin/bash', '-c', 'rpm --import /etc/pki/rpm-gpg/*']) + subprocess.check_call(['/usr/sbin/chroot', anaconda.rootPath, + '/sbin/dracut', '--force', '/boot/initramfs-' + kernel[0] + '.img']) + def getBackend(self): if flags.livecdInstall: import livecd