From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 20 Jun 2012 08:08:39 +0000 (+0200)
Subject: Fix ssh key labelling
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=acd7307b957e69c417474f0a84c8e894f5a8ad28;p=mirror%2Fdsa-puppet.git

Fix ssh key labelling
---

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 f87d165eb..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)"
-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