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

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 165099e83..e48af7e82 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)"
+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