X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fganeti2%2Ftemplates%2Finstance-debootstrap%2Fhooks%2F10-dsa-install-extra-packages.erb;h=e48af7e821fac9064f18301e68dd746cf9cc9867;hb=91ba3db6d50b438a729975451b559858228b3613;hp=165099e834629794468973ffc881f6ac9e2fdb4f;hpb=afcb0205a23957c5b80f08bb942c3355d1712c5e;p=dsa-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 165099e8..e48af7e8 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