figures where modprobe.conf.dist gets installed

diff --git a/build.sh b/build.sh
index 1e6aa52..97e234c 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -57,10 +57,12 @@ pushd $srcdir
 # Root of the isofs
 isofs=$PWD/build/isofs
 
-# Build reference image if it does not exist. This should only need to
-# be executed once at build time, never at run time.
-if [ ! -f $isofs/bootcd.img ] ; then
-    ./prep.sh
+# The reference image is expected to have been built by prep.sh (see .spec)
+# we disable the initial logic that called prep.sh if that was not the case
+# this is because prep.sh needs to know pldistro 
+if [ ! -f $isofs/bootcd.img -o ! -f build/version.txt ] ; then
+    echo "you have to run prep.sh prior to calling $0 - exiting"
+    exit 1
 fi
 
 # build/version.txt written by prep.sh

diff --git a/conf_files/modprobe.conf b/conf_files/modprobe.conf
index 6e5ba04..53165bc 100644 (file)
--- a/conf_files/modprobe.conf
+++ b/conf_files/modprobe.conf
@@ -1 +1 @@
-include /etc/modprobe.conf.dist
+include @MODPROBECONFDIST@

diff --git a/prep.sh b/prep.sh
index 0b7421d..d5a7515 100755 (executable)
--- a/prep.sh
+++ b/prep.sh
@@ -103,6 +103,10 @@ popd
 echo "* Installing IPMI utilities"
 install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
 
+# the place where modprobe.conf gets installed has changed
+modprobedist=$(rpm -ql module-init-tools | grep modprobe.conf.dist)
+sed -i -e "s,@MODPROBECONFDIST@,$modprobedist,g" conf_files/modprobe.conf
+
 # Install configuration files
 echo "* Installing configuration files"
 for file in fstab mtab modprobe.conf inittab hosts sysctl.conf ; do