projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spell sed right
[mirror/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
165099e
..
f87d165
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,6
+10,9
@@
fi
chroot "$TARGET" apt-get -qq update
chroot "$TARGET" apt-get -qq install vim ssh extlinux
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
+
if [ "$ARCH" = "amd64" ]; then
chroot "$TARGET" apt-get -qq install linux-image-amd64
fi
if [ "$ARCH" = "amd64" ]; then
chroot "$TARGET" apt-get -qq install linux-image-amd64
fi