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

[Brian C. Lane]

From: Laszlo Ersek

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 
Signed-off-by: Brian C. Lane

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.

[Colin Walters]

On Tue, Jan 6, 2015, at 12:20 PM, Brian C. Lane wrote:
> +runcmd chroot ${root} find /lib/modules \
>                    -regex ".*/kernel/drivers/char/.*" \
>                    \! -name virtio_console.ko\* \
>                    \! -name hw_random \
>                    \! -name virtio-rng.ko\* \
>                    \! -name ipmi\* \
>                    -delete

This is kind of begging for a more declarative lorax "prune_kernel_modules_except" verb or something.

Hmm...doesn't the "kernel-core"[1] work in F21 address this sufficiently that we could use that and drop this pruning?

Regardless, current patch looks like it fixes the bug to me.

[1] http://fedoraproject.org/wiki/Changes/Modular_Kernel_Packaging_for_Cloud

[Brian C. Lane]

On Tue, Jan 06, 2015 at 12:35:02PM -0500, Colin Walters wrote:
> On Tue, Jan 6, 2015, at 12:20 PM, Brian C. Lane wrote:
> > +runcmd chroot ${root} find /lib/modules \
> >                    -regex ".*/kernel/drivers/char/.*" \
> >                    \! -name virtio_console.ko\* \
> >                    \! -name hw_random \
> >                    \! -name virtio-rng.ko\* \
> >                    \! -name ipmi\* \
> >                    -delete
>
> This is kind of begging for a more declarative lorax "prune_kernel_modules_except" verb or something.

Yeah, it is pretty much time to add something to handle this, but not
for master first.
> Hmm...doesn't the "kernel-core"[1] work in F21 address this sufficiently that we could use that and drop this pruning?

No because these iso's need to boot in various places so the driver set
we need isn't the same as for cloud.

[Vratislav Podzimek]

On Tue, 2015-01-06 at 09:20 -0800, Brian C. Lane wrote:
> From: Laszlo Ersek
>
> 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 
> Signed-off-by: Brian C. Lane
> 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

ACK. I'm glad this is the only change we need for the virtio-rng to work
in the end.