aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--preseed-cfg4
-rwxr-xr-xtdf-postinst-udeb/finish-install.d/07tdf-postinst1
-rwxr-xr-xtdfvm-install1
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" \