I suspect this is a recent change that I missed in the renaming

[bootcd.git] / prep.sh

diff --git a/prep.sh b/prep.sh
index 0a10e9f..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
 
@@ -119,14 +119,6 @@ done
 echo "* Installing fallback node configuration file"
 install -D -m 644 conf_files/default-net.cnf $bootcd/usr/boot/default-net.cnf
 
-# Build pcitable for hardware detection
-echo "* Building pcitable for hardware detection"
-pci_map_file=$(find $bootcd/lib/modules/ -name modules.pcimap | head -1)
-module_dep_file=$(find $bootcd/lib/modules/ -name modules.dep | head -1)
-pci_table=$bootcd/usr/share/hwdata/pcitable
-$srcdir/BootManager/source/merge_hw_tables.py \
-    $module_dep_file $pci_map_file $pci_table $bootcd/etc/pl_pcitable
-
 # Copy /etc/passwd out
 install -D -m 644 $bootcd/etc/passwd build/passwd