naming .lst files after pldistro - including the <pldistro>-vservers directory

diff --git a/build.sh b/build.sh
index de0d5ff..cbb1f89 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
 
@@ -53,8 +57,8 @@ vref=${vrefdir}/${vrefname}
 install -d -m 755 ${vref}
 
 # "Parse" out the packages and groups for mkfedora
-lst="vserver-reference.lst"
-options="$(pl_getPackagesOptions $lst) $(pl_getGroupsOptions $lst)"
+lst="${pldistro}-vserver.lst"
+options="$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst) $(pl_getGroupsOptions ${pl_DISTRO_NAME} $lst)"
 
 # Populate a minimal /dev in the reference image
 pl_makedevs ${vref}
@@ -62,7 +66,7 @@ pl_makedevs ${vref}
 # Populate image with vserver-reference packages
 pl_setup_chroot ${vref} ${options} -k
 
-for systemvserver in reference-vservers/*.lst ; do
+for systemvserver in ${pldistro}-vservers/*.lst ; do
     NAME=$(basename $systemvserver .lst)
 
     echo "--------START BUILDING system vserver ${NAME}: $(date)"

diff --git a/vserver-reference.lst b/planetlab-vserver.lst
similarity index 100%
rename from vserver-reference.lst
rename to planetlab-vserver.lst

diff --git a/reference-vservers/planetflow.lst b/planetlab-vservers/planetflow.lst
similarity index 100%
rename from reference-vservers/planetflow.lst
rename to planetlab-vservers/planetflow.lst

diff --git a/vserver-reference.spec b/vserver-reference.spec
index b78fa41..cdd7c04 100644 (file)
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -47,7 +47,7 @@ resource") slices from the virtual server (VServer) reference image.
 
 %build
 pushd VserverReference
-./build.sh
+./build.sh %{pldistro}
 popd
 
 %install