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=0b0b866c53050b05627a2a7998fa33c38835ba36;hb=7e87f5d68028e8eb0f2c2b6c8b03577e09d4f4db;hp=e48af7e821fac9064f18301e68dd746cf9cc9867;hpb=91ba3db6d50b438a729975451b559858228b3613;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 e48af7e82..0b0b866c5 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,8 +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
+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