From 436d892c18acb32cf96f4e4c2cc80e73ea8b7386 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <ch@grml.org>
Date: Sun, 11 Dec 2011 19:07:05 +0100
Subject: [PATCH] Use premade LOGDIR var

---
 .../fai/config/scripts/GRMLBASE/95-package-information   | 16 +++++-----------
 etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs     |  7 +------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
index 700abf7..1d148e3 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -9,23 +9,17 @@
 set -u
 set -e
 
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-[ -n "$HOSTNAME" ] || HOSTNAME=grml
-PACKAGE_LOG=/var/log/fai/"$HOSTNAME"/last/
-
-if ! [ -w "$PACKAGE_LOG" ] ; then
-   echo "Error: can not write to ${PACKAGE_LOG}. Exiting.">&2
+if ! [ -w "$LOGDIR" ] ; then
+   echo "Error: can not write to ${LOGDIR}. Exiting.">&2
    exit 1
 else
    # store package list for the build process logs as well:
-   COLUMNS=200 $ROOTCMD dpkg --list > "${PACKAGE_LOG}"/dpkg.list
-   COLUMNS=200 $ROOTCMD dpkg --get-selections > "${PACKAGE_LOG}"/dpkg.selections
+   COLUMNS=200 $ROOTCMD dpkg --list > "${LOGDIR}"/dpkg.list
+   COLUMNS=200 $ROOTCMD dpkg --get-selections > "${LOGDIR}"/dpkg.selections
    # store list of packages sorted by size:
    if [ -x $target/usr/bin/dpkg-query ] ; then
       $ROOTCMD dpkg-query -W --showformat='${Package}\t${Installed-Size;10}\n' > \
-      "${PACKAGE_LOG}"/packages.size
+      "${LOGDIR}"/packages.size
    fi
 fi
 
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index 8a4bc3f..d0baa3f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -18,16 +18,11 @@ fi
 set +u
 if ifclass RELEASE ; then
 set -u
-  HOSTNAME=''
-  [ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-  [ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-  [ -n "$HOSTNAME" ] || HOSTNAME=grml
-
   if [ -x $target/usr/sbin/apt-listbugs -a -x $target/usr/bin/apt-show-source ] && \
      [ -x $target/etc/apt/grml/listbugs ] ; then
      for severity in critical grave serious ; do
          SEVERITY=$severity $ROOTCMD /etc/apt/grml/listbugs > \
-         /var/log/fai/$HOSTNAME/last/bugs.${severity} || true # make sure it does not fail
+         $LOGDIR/bugs.${severity} || true # make sure it does not fail
      done
   fi
 
-- 
2.1.4