cleaning up the root creation functions and build.common - untested

[vserver-reference.git] / build.sh

diff --git a/build.sh b/build.sh
index bbef6ee..b426b16 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -37,6 +37,10 @@ pl_process_fedora_options $@
 shiftcount=$?
 shift $shiftcount
 
+# pldistro expected as $1 - defaults to planetlab
+pldistro=planetlab
+[ -n "$@" ] && pldistro=$1
+
 # Do not tolerate errors
 set -e
 
@@ -52,28 +56,20 @@ vrefname=default
 vref=${vrefdir}/${vrefname}
 install -d -m 755 ${vref}
 
-# "Parse" out the packages and groups for mkfedora
-options=""
-lst="vserver-reference.lst"
-vrefpackages=$(pl_getPackages $lst)
-vrefgroups=$(pl_getGroups $lst)
-for package in ${vrefpackages} ; do  options="$options -p $package"; done
-for group in ${vrefgroups} ; do options="$options -g $group"; done
-
-# Populate a minimal /dev in the reference image
-pl_makedevs ${vref}
+# locate the packages and groups file
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs)
 
 # Populate image with vserver-reference packages
-pl_setup_chroot ${vref} ${options}
+pl_root_setup_chroot ${vref} -k -f $pkgsfile
 
-for systemvserver in reference-vservers/*.lst ; do
-    NAME=$(basename $systemvserver .lst)
+for systemvserver in ../build/config.${pldistro}/vserver-*.pkgs ; do
+    NAME=$(basename $systemvserver .pkgs | sed -e s,vserver-,,)
 
     echo "--------START BUILDING system vserver ${NAME}: $(date)"
 
     # "Parse" out the packages and groups for yum
-    systempackages=$(pl_getPackages $systemvserver)
-    systemgroups=$(pl_getGroups $systemvserver)
+    systempackages=$(pl_getPackages ${pl_DISTRO_NAME} $systemvserver)
+    systemgroups=$(pl_getGroups ${pl_DISTRO_NAME} $systemvserver)
 
     vdir=${vstubdir}/${NAME}
     rm -rf ${vdir}/*