Add backwards compability for ZERO_LOGFILE and document it accordingly.

diff --git a/debian/NEWS b/debian/NEWS
index 0bf4e22..0cb159a 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,24 @@
+grml-live (0.9.34) unstable; urgency=low
+
+  * This version introduces an additional package named grml-live-db.
+    The grml-live-db Debian package provides a simple way to put build
+    information of grml-live into a database. By default you have to do
+    nothing but install grml-live-db and during each invocation of
+    grml-live you'll get an additional entry in the sqlite3 database
+    /var/log/grml-live.db. If you want to customize the database logging
+    check out the grml-live-db manpage.
+
+  * Instead of ZERO_LOGFILE a new variable titled PRESERVE_LOGFILE has
+    been introduced. By default grml-live cleans the build logfile so
+    grml-live-db can work straight out-of-the-box. If you still want to
+    preserve your logfiles (e.g. when you don't want to use
+    grml-live-db) just enable the PRESERVE_LOGFILE option in your
+    grml-live configuration file.  For backwards compability reasons the
+    ZERO_LOGFILE variable is still supported within grml-live but it's
+    strongly recommended to adjust configuration.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 30 Jan 2010 14:36:15 +0100
+
 grml-live (0.9.4) unstable; urgency=low
 
   * grml provides its own squashfs-tools again which support LZMA

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index ef80be9..6d58660 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -432,10 +432,9 @@ live-initramfs(8).
 Available log files
 -------------------
 
-grml-live itself logs to /var/log/grml-live.log. Unless you set ZERO_LOGFILE in
-/etc/grml/grml-live.conf the output is appended to the file. If you set the
-ZERO_LOGFILE configuration option the logfile will be truncated on each new
-invocation of grml-live.
+grml-live itself logs to /var/log/grml-live.log. Unless you set PRESERVE_LOGFILE
+in your grml-live configuration the file is cleared on each new invocation of
+grml-live.
 
 The FAI part of grml-live logs to /var/log/fai/$HOSTNAME/ - so the
 default being /var/log/fai/grml/.
@@ -443,6 +442,10 @@ default being /var/log/fai/grml/.
 If you are using the grml-live buildd you will find the logs of the grml-live
 run at /var/log/grml-buildd.stdout and /var/log/grml-buildd.stderr.
 
+If you want to store build information in a database just install the
+grml-live-db Debian package. Further details available in the grml-live-db
+manpage.
+
 [[requirements]]
 Requirements for the build system
 ---------------------------------
@@ -707,7 +710,7 @@ Instructions
   FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian/"
   ARCH="i386"
   CLASSES="GRMLBASE,GRML_MEDIUM,I386"
-  ZERO_LOGFILE='1'
+  # PRESERVE_LOGFILE='1'
   # ZERO_FAI_LOGFILE='1'
   GRML_LIVE_SOURCES="
   deb http://deb.grml.org/            grml-stable  main

diff --git a/grml-live b/grml-live
index 7d8bb82..12596ee 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -289,10 +289,20 @@ ISO_OUTPUT="$OUTPUT/grml_isos"
 # }}}
 
 # clean/zero grml-live logfile {{{
+
+# keep for backwards compability reasons (default behaviour until grml-live 0.9.34)
+if [ -n "$ZERO_LOGFILE" -a -z "$PRESERVE_LOGFILE" ] ; then
+  echo -n > $LOGFILE
+  einfo "Zeroing logfile $LOGFILE as requested via \$ZERO_LOGFILE."
+  ewarn "Please consider disabling the \$ZERO_LOGFILE option as grml-live clears..."
+  ewarn "... the logfile $LOGFILE by default (unless \$PRESERVE_LOGFILE is set) nowadays."
+  eend 0
+fi
+
 if [ -n "$PRESERVE_LOGFILE" ] ; then
   echo "Preserving logfile $LOGFILE as requested via \$PRESERVE_LOGFILE"
 else
-   echo -n > $LOGFILE
+  echo -n > $LOGFILE
 fi
 # }}}