From c2fac3a755349df217d4a036807ac04332644f44 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <ch@grml.org>
Date: Sun, 11 Dec 2011 19:04:12 +0100
Subject: [PATCH] Don't source grml-live.{conf,local} in scripts if not
 required

---
 etc/grml/fai/config/scripts/GRMLBASE/01-packages     | 4 ----
 etc/grml/fai/config/scripts/GRMLBASE/02-run          | 3 ---
 etc/grml/fai/config/scripts/GRMLBASE/03-get-sources  | 3 ---
 etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils | 3 ---
 etc/grml/fai/config/scripts/GRMLBASE/37-portmap      | 3 ---
 etc/grml/fai/config/scripts/GRMLBASE/38-udev         | 3 ---
 etc/grml/fai/config/scripts/GRMLBASE/39-modprobe     | 3 ---
 7 files changed, 22 deletions(-)

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/01-packages b/etc/grml/fai/config/scripts/GRMLBASE/01-packages
index 5ad6aa9..467586c 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/01-packages
+++ b/etc/grml/fai/config/scripts/GRMLBASE/01-packages
@@ -9,10 +9,6 @@
 set -u
 set -e
 
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-
-
 PACKAGE_LIST=/var/log/install_packages.list
 
 if ! [ -r "$target/${PACKAGE_LIST}" ] ; then
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/02-run b/etc/grml/fai/config/scripts/GRMLBASE/02-run
index 319a276..b133a62 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/02-run
+++ b/etc/grml/fai/config/scripts/GRMLBASE/02-run
@@ -9,9 +9,6 @@
 set -u
 set -e
 
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -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
    rm -f "$target/run"
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/03-get-sources b/etc/grml/fai/config/scripts/GRMLBASE/03-get-sources
index fc7afb4..4e20182 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/03-get-sources
+++ b/etc/grml/fai/config/scripts/GRMLBASE/03-get-sources
@@ -6,9 +6,6 @@
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-
 if ifclass SOURCES ; then
   echo "Class SOURCES set, retrieving source packages."
 else
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
index 16445d8..d496684 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
+++ b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
@@ -9,9 +9,6 @@
 set -u
 set -e
 
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-
 if [ -r $target/usr/share/doc/cpufrequtils/examples/cpufrequtils.sample ] ; then
    if ! [ -r $target/etc/default/loadcpufreq ] ; then
       cat $target/usr/share/doc/cpufrequtils/examples/cpufrequtils.sample > $target/etc/default/loadcpufreq
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
index fa84e56..d7a426c 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
+++ b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
@@ -9,9 +9,6 @@
 set -u
 set -e
 
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-
 # Work around a bug in the portmap package, see
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=317358
 
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/38-udev b/etc/grml/fai/config/scripts/GRMLBASE/38-udev
index 33b677b..d5c89d1 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/38-udev
+++ b/etc/grml/fai/config/scripts/GRMLBASE/38-udev
@@ -9,9 +9,6 @@
 set -u
 set -e
 
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-
 CONFFILE="$target/etc/udev/rules.d/70-persistent-net.rules"
 STRING='This file was automatically generated by the /lib/udev/write_net_rules'
 
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
index 86f6723..22f1a25 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
+++ b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe
@@ -9,9 +9,6 @@
 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
-- 
2.1.4