diff options
| author | Guilhem Moulin <guilhem@libreoffice.org> | 2016-10-21 12:01:00 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@libreoffice.org> | 2016-10-21 12:02:40 +0200 |
| commit | 7258b7506f51f6863e5fbe5de178636fb246c831 (patch) | |
| tree | fd28a3b3288718f8d3ef96e7ba609fcf27ab8ba4 | |
| parent | 993cc06ab470a9d8dc5c2d17eecc66d80438e435 (diff) | |
Attach a VirtIO RNG to the guest (and don't install haveged).
To avoid starving the host's RNG we also limit throughput to 512 bytes/s.
| -rw-r--r-- | preseed-cfg | 4 | ||||
| -rwxr-xr-x | tdf-postinst-udeb/finish-install.d/07tdf-postinst | 1 | ||||
| -rwxr-xr-x | tdfvm-install | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/preseed-cfg b/preseed-cfg index 6f45929..b2e37f9 100644 --- a/preseed-cfg +++ b/preseed-cfg @@ -48,9 +48,9 @@ cat <<- EOF # 'tasksel --task-packages standard' tasksel tasksel/first string d-i pkgsel/include string dbus git etckeeper \\ - haveged salt-minion openssh-server \\ + qemu-guest-agent \\ + salt-minion openssh-server \\ bash bash-completion \\ - haveged qemu-guest-agent \\ bind9-host curl \\ screen tmux \\ emacs-nox vim-nox diff --git a/tdf-postinst-udeb/finish-install.d/07tdf-postinst b/tdf-postinst-udeb/finish-install.d/07tdf-postinst index dad9219..f8c0da2 100755 --- a/tdf-postinst-udeb/finish-install.d/07tdf-postinst +++ b/tdf-postinst-udeb/finish-install.d/07tdf-postinst @@ -91,6 +91,7 @@ fi if [ -d /target/etc/salt ]; then in-target sh -c ' + HOME="$(echo ~root)" pkidir="/etc/salt/pki/minion" mkdir -p -m0700 "$pkidir" diff --git a/tdfvm-install b/tdfvm-install index 49190c1..54a0e63 100755 --- a/tdfvm-install +++ b/tdfvm-install @@ -236,6 +236,7 @@ virt-install -q --connect "$LIBVIRT_URI" \ --disk "path=$VMTMPDIR/install.iso,device=cdrom,bus=sata,readonly=on" \ --disk "$DISK,bus=virtio" \ --channel "unix,target_type=virtio,name=org.qemu.guest_agent.0" \ + --rng "random,device=/dev/random,model=virtio,rate_bytes=512" \ --filesystem "source=$VMTMPDIR/virtfs,target=virtfs" \ --network "$NETWORK" \ --graphics "$GRAPHICS" \ |