add option -P in lbuild-initvm

[build.git] / lbuild-initvm.sh

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index c4a83e2..30f8463 100755 (executable)
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -674,13 +674,7 @@ function devel_or_vtest_tools () {
 
     pkg_method=$(package_method $fcdistro)
 
-    # check for .pkgs file based on pldistro
-    if [ -n "$BUILD_MODE" ] ; then
-       pkgsname=devel.pkgs
-    else
-       pkgsname=vtest.pkgs
-    fi
-    pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname)
+    pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $PREINSTALLED)
 
     ### install individual packages, then groups
     # get target arch - use uname -i here (we want either x86_64 or i386)
@@ -719,10 +713,13 @@ function devel_or_vtest_tools () {
 
 function post_install () {
     lxc=$1; shift 
+    personality=$1; shift
     if [ -n "$BUILD_MODE" ] ; then
-       post_install_build $lxc
+       post_install_build $lxc $personality
+       start_lxc $lxc
     else
-       post_install_myplc $lxc
+       post_install_myplc $lxc $personality
+       start_lxc $lxc
        wait_for_ssh $lxc
     fi
     # setup localtime from the host
@@ -786,7 +783,7 @@ PROFILE
     fi
 #
 EOF
-
+       
 }
 
 function post_install_myplc  () {
@@ -900,11 +897,19 @@ function main () {
     RESISTANT=""
     IFNAME=""
     LXC_OPTIONS=""
-    while getopts "f:d:p:i:" opt ; do
+
+    # the set of preinstalled packages - depends on vbuild or vtest
+    if [ -n "$VBUILD_MODE" ] ; then
+       PREINSTALLED=devel.pkgs
+    else
+       PREINSTALLED=vtest.pkgs
+    fi
+    while getopts "f:d:p:P:i:" opt ; do
        case $opt in
            f) fcdistro=$OPTARG;;
            d) pldistro=$OPTARG;;
            p) personality=$OPTARG;;
+           P) PREINSTALLED=$OPTARG;;
            i) IFNAME=$OPTARG;;
            *) usage ;;
        esac
@@ -1021,8 +1026,6 @@ function main () {
 
     post_install $lxc $personality
     
-    start_lxc $lxc
-
     echo $COMMAND Done
 }