replacing pldistro-fcdistro-*.lst with a pldistro-*.lst with variants embedded

diff --git a/planetlab-fc6-bootcd.lst b/planetlab-bootcd.lst
similarity index 98%
rename from planetlab-fc6-bootcd.lst
rename to planetlab-bootcd.lst
index f1549de..916a374 100644 (file)
--- a/planetlab-fc6-bootcd.lst
+++ b/planetlab-bootcd.lst
@@ -42,4 +42,3 @@ package: dos2unix
 package: bind-utils
 package: sharutils
 package: vconfig
-package: ntp

diff --git a/planetlab-f7-bootcd.lst b/planetlab-f7-bootcd.lst
deleted file mode 120000 (symlink)
index 21d4280..0000000
--- a/planetlab-f7-bootcd.lst
+++ /dev/null
@@ -1 +0,0 @@
-planetlab-fc6-bootcd.lst
\ No newline at end of file

diff --git a/planetlab-fc4-bootcd.lst b/planetlab-fc4-bootcd.lst
deleted file mode 120000 (symlink)
index 21d4280..0000000
--- a/planetlab-fc4-bootcd.lst
+++ /dev/null
@@ -1 +0,0 @@
-planetlab-fc6-bootcd.lst
\ No newline at end of file

diff --git a/prep.sh b/prep.sh
index f073239..e36d4c8 100755 (executable)
--- a/prep.sh
+++ b/prep.sh
@@ -32,7 +32,7 @@ export PATH
 pldistro=planetlab
 [ -n "$@" ] && pldistro=$1
 
-# Packages to install : see <pldistro>-<fcdistro>-bootcd.lst
+# Packages to install : see <pldistro>-bootcd.lst
 
 # Unnecessary junk
 junk=(
@@ -78,8 +78,8 @@ install -d -m 755 $bootcd
 rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 >build/version.txt
 
 # Install base system
-lst=${pldistro}-${pl_DISTRO_NAME}-bootcd.lst
-options=$(pl_getPackagesOptions $lst)
+lst=${pldistro}-bootcd.lst
+options=$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst)
 
 pl_setup_chroot $bootcd $options -k