X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=9ce228499c3fe477aa0d57ad86e18b64f72f9b00;hb=39b0f86f3c8f5b5de57a365efce4541bb5c96fd9;hp=92b9f5492d9324cc1f72ca9cb23571dbd484e3c7;hpb=b9df64bb15d9f4688829341fabf2952aa47ad2f3;p=grml-live.git

diff --git a/grml-live b/grml-live
index 92b9f54..9ce2284 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 17 23:53:13 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,15 @@ 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
+
 # }}}
 
 # some important functions {{{
@@ -176,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 {{{
@@ -189,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"
@@ -213,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 {{{
@@ -235,7 +247,7 @@ elif [ -n "$GRML_LIVE_SOURCES" ] ; then
 fi
 
 if [ -n "$FAI_DEBOOTSTRAP" ] ; then
-   sed -i "s#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP=\"$FAI_DEBOOTSTRAP\"#" /etc/grml/fai/make-fai-nfsroot.conf
+   sed -i "s#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP=\"$FAI_DEBOOTSTRAP\"#" $NFSROOT_CONF
 fi
 
 # does this suck? YES!
@@ -247,13 +259,15 @@ if [ -n "$SUITE" ] ; then
    sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list
 
    sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $LIVE_CONF
-   sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" /etc/grml/fai/make-fai-nfsroot.conf
+   sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $NFSROOT_CONF
 fi
 
 # set $ARCH
-if grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' /etc/grml/fai/make-fai-nfsroot.conf || \
-   [ "$(dpkg --print-architecture)" != "$ARCH" ] ; then
-   sed -i "s|FAI_DEBOOTSTRAP_OPTS=\"\(.*\)|FAI_DEBOOTSTRAP_OPTS=\"--arch $ARCH \1|" /etc/grml/fai/make-fai-nfsroot.conf
+[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
+if grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' $NFSROOT_CONF ; then
+   sed -i "s/--arch [a-z0-9]* /--arch $ARCH /" $NFSROOT_CONF
+else
+   sed -i "s|FAI_DEBOOTSTRAP_OPTS=\"\(.*\)|FAI_DEBOOTSTRAP_OPTS=\"--arch $ARCH \1|" $NFSROOT_CONF
 fi
 # }}}
 
@@ -304,8 +318,6 @@ fi
 [ -n "$BUILD_OUTPUT" ] || BUILD_OUTPUT="$OUTPUT/grml_cd"
 mkdir -p "$BUILD_OUTPUT" || bailout 6 "Problem with creating $BUILD_OUTPUT for stage ARCH"
 
-[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
-
 # i386:
 if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
    if [ -d "$BUILD_OUTPUT"/boot ] ; then
@@ -446,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 "------------------------------------------------------------------------------"