Use version number; log to grml-buildd inside buildd

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index a1939cd..9ce2284 100755 (executable)
--- 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: Wed Oct 24 10:11:02 CEST 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -15,6 +15,8 @@ export LC_ALL=C
 # exit on any error:
 set -e
 
+GRML_LIVE_VERSION='0.0.7'
+
 # we need root permissions for the build-process:
 if [ "$(id -u 2>/dev/null)" != 0 ] ; then
    echo "Error: please run this script with uid 0 (root)." >&2
@@ -69,8 +71,12 @@ 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"
+[ -d /var/log/fai/dirinstall/"${HOSTNAME}" ] || mkdir -p /var/log/fai/dirinstall/${HOSTNAME}
+if [ -d /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
 
@@ -179,7 +185,8 @@ while getopts "a:c:g:i:o:r:s:t:v:FhV" opt; do
 done
 shift $(($OPTIND - 1))  # set ARGV to the first not parsed commandline parameter
 
-echo "Executing: $(basename $0) $*" >> $LOGFILE
+echo "Executing grml-live $GRML_LIVE_VERSION using the commandline:" >> $LOGFILE
+echo "$(basename $0) $@" >> $LOGFILE
 # }}}
 
 # some misc checks before executing FAI {{{
@@ -192,7 +199,7 @@ specify it on the command line using the -o option."
 # ask user whether the setup is ok {{{
 if [ -z "$FORCE" ] ; then
    echo
-   echo "${PN}: check your configuration (or use -F to force execution without prompting):"
+   echo "${PN} [${GRML_LIVE_VERSION}]: check your configuration (or use -F to force execution):"
    echo
    echo "  FAI classes:       $CLASSES"
    echo "  main directory:    $OUTPUT"
@@ -216,10 +223,12 @@ if [ -z "$FORCE" ] ; then
    fi
    echo
 
-   start_seconds=$(cut -d . -f 1 /proc/uptime)
-   log "------------------------------------------------------------------------------"
-   log "Starting grml-live run [$(date)]"
 fi
+
+start_seconds=$(cut -d . -f 1 /proc/uptime)
+log "------------------------------------------------------------------------------"
+log "Starting grml-live run [$(date)]"
+log "Executed command line: $0 $*"
 # }}}
 
 # on-the-fly configuration {{{
@@ -449,7 +458,7 @@ fi
 # }}}
 
 # finalize {{{
-[ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]"
+[ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]" || SECONDS="unknown"
 einfo "Sucessfully finished execution of $PN [running ${SECONDS} seconds]" ; eend 0
 log "Sucessfully finished execution of $PN [running ${SECONDS} seconds]"
 log "------------------------------------------------------------------------------"