Unifiy local config handling

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 02-run

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/02-run b/etc/grml/fai/config/scripts/GRMLBASE/02-run
index 86b86ee..319a276 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/02-run
+++ b/etc/grml/fai/config/scripts/GRMLBASE/02-run
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/02-run
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/02-run
 # Purpose:       cleanup after initscripts postinst for /run
 # Authors:       grml-team (grml.org)
 # 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"
 
 # This is what initscripts would do if everything would be fine.
 if [ -L "$target/run" ] ; then
@@ -25,4 +25,4 @@ if [ -L "$target/run" ] ; then
 fi
 
 ## 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