X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F39-modprobe;h=31e97f9e063d32bffbc4604e676da90fc9444c37;hb=f3768e9fae392e5bbd674912568c256fc7d216ea;hp=0c1c5aa819948e250f53c416826792984ccce76b;hpb=5bc75ae9d2442b86f89f3cf225b459a0d601bced;p=grml-live.git diff --git a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe index 0c1c5aa..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/bash -# Filename: /etc/grml/fai/config/scripts/GRMLBASE/39-modprobe +# Filename: ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/39-modprobe # Purpose: adjust modprobe configuration # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ @@ -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,7 +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 -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