From: Michael Prokop <devnull@localhost>
Date: Wed, 17 Oct 2007 22:43:29 +0000 (+0200)
Subject: Merge branches
X-Git-Tag: 0.0.6~6
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=0edfd588036d9663063186c6f185391000c0bfaf;hp=a090ad82e812624a5e67b957f5b50878b28b457e;p=grml-live.git

Merge branches
---

diff --git a/debian/changelog b/debian/changelog
index 1d19b11..8ac80a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ grml-live (0.0.6) unstable; urgency=low
     grml(32) on amd64.
   * Fix stderr redirection in "/usr/sbin/fai already running..."
   * Update /etc/grml/fai/make-fai-nfsroot.conf
+  * Use /var/log/fai/dirinstall/${HOSTNAME}/grml-live.log as logfile
+    for grml-live instead of /var/log/grml-live.log so it's easier
+    to track.
   * Update of buildd scripts: main configuration file main.sh
     which provides all the build stuff inside separate functions.
 
diff --git a/grml-live b/grml-live
index a1939cd..b819850 100755
--- a/grml-live
+++ b/grml-live
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Thu Oct 18 00:18:07 CEST 2007 [mika]
+# Latest change: Thu Oct 18 00:42:13 CEST 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -69,8 +69,11 @@ trap bailout 1 2 3 15
 [ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
 [ -n "$GRML_NAME" ] || GRML_NAME='grml'
 
-[ -n "$LOGDIR" ] || LOGDIR="/var/log/"
-LOGFILE="$LOGDIR/grml-live.log"
+if mkdir -p /var/log/fai/dirinstall/${HOSTNAME} ; then
+   LOGFILE=/var/log/fai/dirinstall/${HOSTNAME}/grml-live.log
+else
+   LOGFILE="$LOGDIR/grml-live.log"
+fi
 
 NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf