Unifiy local config handling

[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 6b00768..31e97f9 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
+++ b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
@@ -10,7 +10,7 @@ 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
@@ -18,10 +18,10 @@ set -e
 find $target/etc/modprobe.d -maxdepth 1 -type f ! -name \*\.conf -exec mv {} {}.conf \;
 
 # Replace modprobe configuration files to workaround issues.
-fcopy /etc/modprobe.d/radeon-kms.conf
+fcopy -v /etc/modprobe.d/radeon-kms.conf
 
 # Copy the loop options
-fcopy /etc/modprobe.d/loop-part.conf
+fcopy -v /etc/modprobe.d/loop-part.conf
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2