Fix ssh public key labels

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 165099e834629794468973ffc881f6ac9e2fdb4f..e48af7e821fac9064f18301e68dd746cf9cc9867 100755 (executable)
--- 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)"
+set -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