aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2010-07-15 20:24:51 -0300
committerdrebs <drebs@riseup.net>2010-07-15 20:24:51 -0300
commit3673347a0e321bbbc7072b033f69baeda6531a4f (patch)
treefd2e806776fe5a5e34da9de29e4ad7d1683ac987
parentd77b287fae09f728747f12dcdc6ce7e243974189 (diff)
parent654e6ab3e7a0fd06e3695447b1988a24785b5a09 (diff)
downloadpuppet-virtual-3673347a0e321bbbc7072b033f69baeda6531a4f.tar.gz
puppet-virtual-3673347a0e321bbbc7072b033f69baeda6531a4f.tar.bz2
Merge branch 'master' of ssh://gitosis@git.sarava.org/puppet-virtual
-rw-r--r--files/vserver/build_vserver5
1 files changed, 3 insertions, 2 deletions
diff --git a/files/vserver/build_vserver b/files/vserver/build_vserver
index a74ea5f..11d38ed 100644
--- a/files/vserver/build_vserver
+++ b/files/vserver/build_vserver
@@ -25,8 +25,9 @@ cp /etc/apt/{preferences,sources.list} $TARGET/etc/apt/
# this is needed so puppet can find the puppetmaster and creates the right
# certificate
-grep -v $NAME /etc/hosts > $TARGET/etc/hosts
-echo "127.0.0.1 $NAME" >> $TARGET/etc/hosts
+#grep -v $NAME /etc/hosts > $TARGET/etc/hosts
+#echo "127.0.0.1 $NAME" >> $TARGET/etc/hosts
+echo "127.0.0.1 $NAME" > $TARGET/etc/hosts
#mkdir -p $TARGET/var/lib/puppet/modules/dbp
#cp /var/lib/puppet/modules/dbp/puppet_current.deb $TARGET/var/lib/puppet/modules/dbp/