[master/rhel7] runtime-cleanup.tmpl: keep virtio-rng (#1179000)

Brian C. Lane bcl at redhat.com
Tue Jan 6 17:20:15 UTC 2015


From: Laszlo Ersek <lersek at redhat.com>

Virtual machines easily get starved for randomness, and Anaconda insists
on sufficient amounts of entropy when the user requests LUKS disk
encryption. As a result, such installations can hang until Anaconda gives
up (after 10 minutes) and makes do with whatever entropy is available.

The virtualization host can feed randomness to the guest, unblocking the
installation. However, the guest can only consume that randomness through
the virtio-rng module. Let's not remove that module.

Signed-off-by: Laszlo Ersek <lersek at redhat.com>
Signed-off-by: Brian C. Lane <bcl at redhat.com>

Resolves: rhbz#1179000
---
 share/runtime-cleanup.tmpl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index a5507b8..2a0aeeb 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -91,7 +91,15 @@ arch/x86/kvm
 %endfor
 remove lib/modules/*/{build,source,*.map}
 ## Need to keep virtio_console.ko and ipmi stuff in drivers/char
-runcmd chroot ${root} find /lib/modules -regex ".*/kernel/drivers/char/.*" \! -name virtio_console.ko\* \! -name ipmi* -delete
+## Also keep virtio-rng so that the installer can get sufficient randomness for
+## LUKS setup.
+runcmd chroot ${root} find /lib/modules \
+                        -regex ".*/kernel/drivers/char/.*" \
+                        \! -name virtio_console.ko\* \
+                        \! -name hw_random \
+                        \! -name virtio-rng.ko\* \
+                        \! -name ipmi\* \
+                        -delete
 ## NOTE: depmod gets re-run after cleanup finishes
 
 ## remove unused themes, theme engines, icons, etc.
-- 
1.9.3



More information about the anaconda-patches mailing list