this mostly undoes changeset http://svn.planet-lab.org/changeset/6958

that would not work on fc4 anymore

in any case this .dist file is a dummy placeholder that reads
# empty file, can be removed, if it is not included by /etc/modprobe.conf

diff --git a/conf_files/modprobe.conf b/conf_files/modprobe.conf
index 53165bc..66fb9fb 100644 (file)
--- a/conf_files/modprobe.conf
+++ b/conf_files/modprobe.conf
@@ -1 +1,4 @@
-include @MODPROBECONFDIST@
+# on fc6 this does not exist anymore
+# it used to be a placeholder anyway
+#include /etc/modprobe.conf.dist
+

diff --git a/prep.sh b/prep.sh
index d5a7515..0b7421d 100755 (executable)
--- a/prep.sh
+++ b/prep.sh
@@ -103,10 +103,6 @@ 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