21-usersetup: check for existing /bin/zsh inside the chroot

[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 86f6723..fae8d06 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
+++ b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
@@ -9,16 +9,13 @@
 set -u
 set -e
 
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-
 # Make sure all modprobe configuration files use .conf as filename suffix.
 # See http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=module-init-tools;dist=unstable
 # and http://blog.bofh.it/debian/id_236
 find $target/etc/modprobe.d -maxdepth 1 -type f ! -name \*\.conf -exec mv {} {}.conf \;
 
-# Copy the loop options
-fcopy -v /etc/modprobe.d/loop-part.conf
+# Install all present modprobe.d configuration files
+fcopy -v -r /etc/modprobe.d
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2