X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Ftemplates%2Finstance-debootstrap%2Fhooks%2F10-dsa-install-extra-packages.erb;h=f87d165eb22914fd3fd8b797e0b803d5fefa2b9f;hb=14235e6b690b63b523ee5df04a3df0e0f53ef7d2;hp=165099e834629794468973ffc881f6ac9e2fdb4f;hpb=dd401e461e4a6e250300bede2d3ab65d1193fe62;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/templates/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb b/modules/ganeti2/templates/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb
index 165099e83..f87d165eb 100755
--- a/modules/ganeti2/templates/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb
+++ b/modules/ganeti2/templates/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb
@@ -10,6 +10,9 @@ fi
 chroot "$TARGET" apt-get -qq update
 chroot "$TARGET" apt-get -qq install vim ssh extlinux
 
+hostname="$(hostname)"
+sed -e "s#root@$hostname#root@$instance#" -i /etc/ssh/ssh*pub
+
 if [ "$ARCH" = "amd64" ]; then
     chroot "$TARGET" apt-get -qq install linux-image-amd64
 fi