X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=c7f48c17930bd2dc959b25819d5f72e270d41354;hp=d595a4173354bc70a6ef9f03d0bb431c295f32e6;hb=f9fdf13a9a60e4a9b4f7859a0fe38266dff24abf;hpb=bb219703a202a15aa6f9d72ef0563c52b69ff567

diff --git a/grml-live b/grml-live
index d595a41..c7f48c1 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 10:11:02 CEST 2007 [mika]
+# Latest change: Sun Oct 28 15:26:10 CET 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -16,6 +16,8 @@ export LC_ALL=C
 set -e
 
 GRML_LIVE_VERSION='0.0.7'
+CMDLINE="$0 $@"
+ISO_DATE="$(date +%Y-%m-%d)"
 
 # we need root permissions for the build-process:
 if [ "$(id -u 2>/dev/null)" != 0 ] ; then
@@ -54,6 +56,7 @@ bailout() {
   [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
   [ -n "$1" ] && EXIT="$1" || EXIT="1"
   [ -n "$2" ] && eerror "$2">&2
+  log "------------------------------------------------------------------------------"
   exit "$EXIT"
 }
 trap bailout 1 2 3 15
@@ -71,8 +74,17 @@ trap bailout 1 2 3 15
 [ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
 [ -n "$GRML_NAME" ] || GRML_NAME='grml'
 
-[ -d /var/log/grml-live ] || mkdir /var/log/grml-live
-LOGFILE=/var/log/grml-live/"$(date +%Y-%m-%d)_$$.log"
+# logfile:
+if [ -z "$LOGFILE" ] ; then
+   LOGFILE=/var/log/grml-live.log
+fi
+touch $LOGFILE
+chown root:adm $LOGFILE
+chmod 640 $LOGFILE
+# clean/zero logfile:
+if [ -n "$ZERO_LOGFILE" ] ; then
+   echo -n > $LOGFILE
+fi
 
 NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf
 
@@ -207,8 +219,8 @@ if [ -z "$FORCE" ] ; then
    [ -n "$BOOT_METHOD" ]   && echo "  Boot method:       $BOOT_METHOD"
    [ -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"
+   [ -n "$VERBOSE" ]       && echo "  Using VERBOSE mode."
    echo
    echo -n "Is this ok for you? [y/N] "
    read a
@@ -220,8 +232,8 @@ fi
 
 start_seconds=$(cut -d . -f 1 /proc/uptime)
 log "------------------------------------------------------------------------------"
-log "Starting grml-live [${GRML_LIVE_VERSION}] run [$(date)]"
-log "Executed command line: $0 $@"
+log "Starting grml-live [${GRML_LIVE_VERSION}] run on $(date)"
+log "Executed command line: $CMDLINE"
 
 einfo "Logging actions to logfile $LOGFILE"
 # }}}
@@ -254,7 +266,7 @@ if [ -n "$SUITE" ] ; then
    sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list
    # notice: activate grml-live pool only if we are building against unstable:
    if grep -qe unstable -qe sid /etc/grml/fai/apt/sources.list ; then
-      grep -q 'grml-live.*main' || \
+      grep -q 'grml-live.*main' /etc/grml/fai/apt/sources.list || \
       grep grml-stable /etc/grml/fai/apt/sources.list | \
            sed 's/grml-stable/grml-live/' >> /etc/grml/fai/apt/sources.list
    else
@@ -288,6 +300,9 @@ else
       mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
    fi
    fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u "$HOSTNAME" dirinstall "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE
+   log "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]"
+   echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]" > $CHROOT_OUTPUT/etc/grml_version
+   chmod 644 $CHROOT_OUTPUT/etc/grml_versio
    umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true
    umount $CHROOT_OUTPUT/sys  2>/dev/null || /bin/true
    [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
@@ -368,7 +383,6 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       cp -a ${TEMPLATE_DIRECTORY}/GRML/* "$BUILD_OUTPUT"/GRML/
 
       # adjust boot splash information:
-      ISO_DATE="$(date +%Y-%m-%d)"
       RELEASE_INFO="$GRML_NAME $VERSION - Release Codename $RELEASENAME"
       RELEASE_INFO="$(cut_string 68 "$RELEASE_INFO")"
       RELEASE_INFO="$(extend_string_end 68 "$RELEASE_INFO")"
@@ -466,7 +480,6 @@ fi
 [ -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 "------------------------------------------------------------------------------"
 bailout 0
 # }}}