From 0a08c07e12394fabaf1b92b9c10f0632d88de1c3 Mon Sep 17 00:00:00 2001
From: Michael Prokop <devnull@localhost>
Date: Mon, 26 Nov 2007 19:58:51 +0100
Subject: [PATCH] Adjust grml-buildd for new logdir structure

---
 buildd/functions.sh                                  | 4 ++--
 debian/changelog                                     | 1 +
 etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs | 2 +-
 etc/grml/grml-live.conf                              | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 967c8f1..7b979bc 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -45,7 +45,7 @@ else
    [ -n "$GRML_LOGFILE" ]  || GRML_LOGFILE=/var/log/grml-live.log
 fi
 
-[ -n "$FAI_LOGFILES" ]  || FAI_LOGFILES=/var/log/fai/dirinstall/grml
+[ -n "$FAI_LOGFILES" ]  || FAI_LOGFILES=/var/log/fai/grml/last
 
 echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS
 
@@ -72,7 +72,7 @@ grml_live_run() {
 
 # create log archive:
 create_logs() {
-  ( cd / && tar zcf $ATTACHMENT var/log/fai/dirinstall/grml $GRML_LOGFILE 1>/dev/null )
+  ( cd / && tar zcf $ATTACHMENT $FAI_LOGFILES $GRML_LOGFILE 1>/dev/null )
 }
 
 # store information of ISO size:
diff --git a/debian/changelog b/debian/changelog
index 1f30d4c..d857b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ grml-live (0.0.11) unstable; urgency=low
   * Add X.org packages to GRML_MEDIUM.
   * Make sure /etc/X11/X is not a symlink to /bin/true. Check and fix
     via /etc/grml/fai/config/scripts/GRMLBASE/32-xorg.
+  * Adjust grml-buildd for new logdir structure.
 
  -- Michael Prokop <mika@grml.org>  Mon, 26 Nov 2007 15:07:54 +0100
 
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index a8b4a38..ec8e758 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -45,7 +45,7 @@ if ifclass RELEASE ; then
      [ -x $target/etc/apt/grml/listbugs ] ; then
      for severity in critical grave serious ; do
          SEVERITY=$severity $ROOTCMD /etc/apt/grml/listbugs > \
-         /var/log/fai/dirinstall/$HOSTNAME/bugs.${severity} || true # make sure it does not fail
+         /var/log/fai/$HOSTNAME/last/bugs.${severity} || true # make sure it does not fail
      done
   fi
 
diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 4555cb7..3420d0d 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -99,7 +99,7 @@ GRML_FAI_CONFIG=/etc/grml/fai
 # FAI_ARGS=""
 
 # Where do you want to store grml-live.log?
-# LOGDIR="/var/log/fai/dirinstall/$HOSTNAME"
+# LOGDIR="/var/log/fai/$HOSTNAME/last"
 
 # Which architecture do you want to build?
 # It defaults to output of 'dpkg --print-architecture'
-- 
2.1.4