X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml-live;h=766f5880bc63c45b3a41b05556ed5770efdc01e5;hb=6a194dc7a547d38991661f50aee86ad0907da6db;hp=b8198507b872a152e3406ef1c4cae690e66d2be6;hpb=0edfd588036d9663063186c6f185391000c0bfaf;p=grml-live.git diff --git a/grml-live b/grml-live index b819850..766f588 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # 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:42:13 CEST 2007 [mika] +# Latest change: Wed Oct 24 09:26:39 CEST 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -69,7 +69,8 @@ trap bailout 1 2 3 15 [ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks" [ -n "$GRML_NAME" ] || GRML_NAME='grml' -if mkdir -p /var/log/fai/dirinstall/${HOSTNAME} ; then +[ -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" @@ -219,10 +220,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 {{{ @@ -452,7 +455,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 "------------------------------------------------------------------------------"