Minor fixes/changes

diff --git a/files/vserver/build_vserver b/files/vserver/build_vserver
index 260889c89f0cdcd99577b929dd255b9b31e2b0c5..9f69c7f771c35e74ffc4d12294d12ddeb2b90d60 100644 (file)
--- a/files/vserver/build_vserver
+++ b/files/vserver/build_vserver
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-NAME=$1
-CONTEXT=$2
-RELEASE=$3
-DEBOOTSTRAP_MIRROR=$4
-VHOSTNAME=$5
-VINTERFACE=$6
+NAME="$1"
+CONTEXT="$2"
+RELEASE="$3"
+DEBOOTSTRAP_MIRROR="$4"
+VHOSTNAME="$5"
+VINTERFACE="$6"
 
 if [ $VHOSTNAME != "none" ]; then
   VHOSTNAME="--hostname $VHOSTNAME"
@@ -33,11 +33,11 @@ echo "127.0.0.1 $NAME" >> $TARGET/etc/hosts
 # Setup is complete, now do the post-install stuff
 vserver $NAME start
 vserver $NAME exec dselect update
-# install a few packages needed for facter
-vserver $NAME exec apt-get -y install lsb-release iproute
+# install a few needed packages
+vserver $NAME exec apt-get -y install lsb-release iproute cron sudo openssh-server
+
 #vserver $NAME exec dpkg --install var/lib/puppet/modules/dbp/puppet_current.deb
 #vserver $NAME exec apt-get -fy install
-
 #echo "Please sign now: puppetca --sign $NAME" >&2
 
 echo "VServer $NAME created"

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index c474bbf2f6fd8c85c83464ebe22bb8d241cc3a41..3960bab1ce0ef002cfd8e88e3818d0a9d410bf82 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -131,7 +131,7 @@ define vs_create($in_domain, $context, $legacy = false, $distro = 'etch',
       }
     }
     false: {
-      exec { "/usr/local/bin/build_vserver \"${vs_name}\" ${context} ${distro} ${debootstrap_mirror} ${vs_hostname} ${interface}":
+      exec { "/usr/local/bin/build_vserver \"${vs_name}\" ${context} ${distro} ${debootstrap_mirror} ${vs_hostname} ${vs_interface}":
         creates => "/etc/vservers/${vs_name}",
         require => File["/usr/local/bin/build_vserver"],
         alias => "vs_create_${vs_name}"