X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=1ec32e599d65104576c1cb9abe9bd8aa2d11ef64;hb=b3b07ef7a30ac21c82a71e1ad599734425185a8a;hp=9ce228499c3fe477aa0d57ad86e18b64f72f9b00;hpb=39b0f86f3c8f5b5de57a365efce4541bb5c96fd9;p=grml-live.git

diff --git a/grml-live b/grml-live
index 9ce2284..1ec32e5 100755
--- a/grml-live
+++ b/grml-live
@@ -71,12 +71,8 @@ trap bailout 1 2 3 15
 [ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
 [ -n "$GRML_NAME" ] || GRML_NAME='grml'
 
-[ -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
+[ -d /var/log/grml-live ] || mkdir /var/log/grml-live
+LOGFILE=/var/log/grml-live/"$(date +%Y-%m-%d)_$$.log"
 
 NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf
 
@@ -184,9 +180,6 @@ while getopts "a:c:g:i:o:r:s:t:v:FhV" opt; do
   esac
 done
 shift $(($OPTIND - 1))  # set ARGV to the first not parsed commandline parameter
-
-echo "Executing grml-live $GRML_LIVE_VERSION using the commandline:" >> $LOGFILE
-echo "$(basename $0) $@" >> $LOGFILE
 # }}}
 
 # some misc checks before executing FAI {{{
@@ -215,6 +208,7 @@ if [ -z "$FORCE" ] ; then
    [ -n "$TEMPLATE_DIRECTORY" ] && echo "  Template files:    $TEMPLATE_DIRECTORY"
    [ -n "$FAI_ARGS" ]      && echo "  additional arguments for FAI: $FAI_ARGS"
    [ -n "$VERBOSE" ]       && echo "  Using VERBOSE mode."
+   [ -n "$LOGFILE" ]       && echo "  Logging to file:   $LOGFILE"
    echo
    echo -n "Is this ok for you? [y/N] "
    read a
@@ -222,13 +216,14 @@ if [ -z "$FORCE" ] ; then
       bailout 1 "Exiting as requested."
    fi
    echo
-
 fi
 
 start_seconds=$(cut -d . -f 1 /proc/uptime)
 log "------------------------------------------------------------------------------"
-log "Starting grml-live run [$(date)]"
-log "Executed command line: $0 $*"
+log "Starting grml-live [${GRML_LIVE_VERSION}] run [$(date)]"
+log "Executed command line: $0 $@"
+
+einfo "Logging actions to logfile $LOGFILE"
 # }}}
 
 # on-the-fly configuration {{{
@@ -292,6 +287,7 @@ else
    ERROR=''
    if [ -r "/var/log/fai/dirinstall/$HOSTNAME/software.log" ] ; then
       # 1 errors during executing of commands
+      # Unable to write mmap - msync (28 No space left on device)
       grep 'dpkg: error processing' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=1
       grep 'E: Method http has died unexpectedly!' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=2
       grep 'ERROR: chroot' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=3