Fix ssh key labelling

[dsa-puppet.git] / modules / ganeti2 / templates / instance-debootstrap / hooks / 10-dsa-install-extra-packages.erb

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 f87d165eb22914fd3fd8b797e0b803d5fefa2b9f..0b0b866c53050b05627a2a7998fa33c38835ba36 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,8 +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
+node="$(hostname)"
+instance="$(cat $TARGET/etc/hostname)"
+sed -e "s#root@$node#root@$instance#" -i "$TARGET"/etc/ssh/ssh*pub
 
 if [ "$ARCH" = "amd64" ]; then
     chroot "$TARGET" apt-get -qq install linux-image-amd64