From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Nov 2022 10:36:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/123'
X-Git-Tag: v0.42.2~3
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=60718f36f5f02b77867614c2a3177aba1723c769;hp=c55290be997ac9f822dbd57ec9a9721298ba8f35

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

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
index e2fc70a..849809d 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
+++ b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
@@ -17,5 +17,10 @@ find $target/etc/modprobe.d -maxdepth 1 -type f ! -name \*\.conf -exec mv {} {}.
 # Install all present modprobe.d configuration files
 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