X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F39-modprobe;h=31e97f9e063d32bffbc4604e676da90fc9444c37;hp=5236871b4727a4ebab5162e5c81b4adf1bb3204f;hb=9dafaad2fe959f195d68a38655f60d00ee028256;hpb=4cc4aae1d69b821df66e934febac107e022cb1ef

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
index 5236871..31e97f9 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
+++ b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/39-modprobe
 # Purpose:       adjust modprobe configuration
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -10,12 +10,18 @@ set -u
 set -e
 
 [ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
+[ -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 \;
 
+# Replace modprobe configuration files to workaround issues.
+fcopy -v /etc/modprobe.d/radeon-kms.conf
+
+# Copy the loop options
+fcopy -v /etc/modprobe.d/loop-part.conf
+
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2