renamed native-shell.pkgs into vtest.pkgs

[build.git] / vbuild-init-vserver.sh

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index de96955..d1b44b5 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -55,7 +55,7 @@ function configure_yum_in_vserver () {
        else
             # exclude kernel from fedora repos 
            for i in /vservers/$vserver/etc/yum.repos.d/* ; do
-               echo "exclude=kernel* ulogd iptables" >> $i
+               [ -f $i ] && echo "exclude=kernel* ulogd iptables" >> $i
            done
            # the build repo is not signed at this stage
            cat > /vservers/$vserver/etc/yum.repos.d/myplc.repo <<EOF
@@ -127,7 +127,7 @@ function setup_vserver () {
 
     # start the vserver so we can do the following operations
     $personality vserver $VERBOSE $vserver start
-    $personality vserver $VERBOSE $vserver exec rm -f /var/lib/rpm/__db*
+    $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"
     $personality vserver $VERBOSE $vserver exec rpm --rebuilddb
 
     # minimal config in the vserver for yum to work
@@ -152,7 +152,7 @@ function devel_tools () {
     if [ -n "$VBUILD_MODE" ] ; then
        pkgsname=devel.pkgs
     else
-       pkgsname=native-shell.pkgs
+       pkgsname=vtest.pkgs
     fi
     pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname)
 
@@ -249,13 +249,11 @@ function post_install_myplc  () {
 export PS1="[$vserver] \\w # "
 PROFILE
 
-    # turn off some services - as they'll get started through plc
-    for i in mail postgresql ssh httpd ; do chkconfig $i off ; done
 EOF
 }
 
 COMMAND_VBUILD="vbuild-init-vserver.sh"
-COMMAND_MYPLC="myplc-init-vserver.sh"
+COMMAND_MYPLC="vtest-init-vserver.sh"
 function usage () {
     set +x 
     echo "Usage: $COMMAND_VBUILD [options] vserver-name [ -- vserver-options ]"