Unifiy local config handling

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 95-package-information

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
index f1196de..700abf7 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -11,14 +11,10 @@ set -e
 
 HOSTNAME=''
 [ -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"
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
 PACKAGE_LOG=/var/log/fai/"$HOSTNAME"/last/
 
-# generate the package list and store it on the ISO itself for grml-docs:
-[ -d $target/usr/share/doc/grml-docs/packages ] || mkdir -p $target/usr/share/doc/grml-docs/packages
-COLUMNS=200 $ROOTCMD dpkg --list > $target/usr/share/doc/grml-docs/packages/dpkg_list
-
 if ! [ -w "$PACKAGE_LOG" ] ; then
    echo "Error: can not write to ${PACKAGE_LOG}. Exiting.">&2
    exit 1