Merge remote-tracking branch 'origin/github/pr/148'

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 39-modprobe

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
index fae8d06..849809d 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
+++ b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
@@ -15,7 +15,12 @@ set -e
 find $target/etc/modprobe.d -maxdepth 1 -type f ! -name \*\.conf -exec mv {} {}.conf \;
 
 # Install all present modprobe.d configuration files
-fcopy -v -r /etc/modprobe.d
+fcopy -v -i -r /etc/modprobe.d
+
+if [ -f "${target}/lib/modprobe.d/50-nfs.conf" ] ; then  # nfs-kernel-server >=1:2.6.2-1
+  echo "Clearing /lib/modprobe.d/50-nfs.conf to avoid automatic kmod/busybox issues"
+  echo '# this file was generated by grml-live script GRMLBASE/39-modprobe' > "${target}/lib/modprobe.d/50-nfs.conf"
+fi
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2