X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=f4f299e49479f142f7d142dce92d1f07fa4a6e3c;hp=766f5880bc63c45b3a41b05556ed5770efdc01e5;hb=33aac1f44e84fa85f3237f9b54f590ce232e207b;hpb=6a194dc7a547d38991661f50aee86ad0907da6db

diff --git a/grml-live b/grml-live
index 766f588..f4f299e 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: Wed Oct 24 09:26:39 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,7 +71,7 @@ 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} 
+[ -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
@@ -182,8 +184,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: $(basename $0) $*" >> $LOGFILE
 # }}}
 
 # some misc checks before executing FAI {{{
@@ -196,7 +196,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"
@@ -219,13 +219,12 @@ 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 $@"
 # }}}
 
 # on-the-fly configuration {{{
@@ -289,6 +288,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