X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=ca826c6823fe453f7ef964c10c773ca4050aeb90;hp=1becf15ed8f7e6ba676281f2dad4350db4b461a1;hb=68b9fb146e8702b2f6a790e3d9486ca36f0d9f76;hpb=822c1ca687fbc1af75de3b6c8651896a71c9f638

diff --git a/grml-live b/grml-live
index 1becf15..ca826c6 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: Mon Nov 05 09:24:45 CET 2007 [mika]
+# Latest change: Sun Nov 25 16:35:35 CET 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -15,7 +15,7 @@ export LC_ALL=C
 # exit on any error:
 set -e
 
-GRML_LIVE_VERSION='0.0.7'
+GRML_LIVE_VERSION='0.0.10'
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"
 
@@ -341,11 +341,7 @@ else
 
    # notice: 'fai dirinstall' does not seem to exit appropriate, so:
    ERROR=''
-   if [ -n "$UPDATE" ] ; then
-      CHECKLOG=/var/log/fai/current/
-   else
-      CHECKLOG=/var/log/fai/dirinstall/$HOSTNAME/
-   fi
+   CHECKLOG=/var/log/fai/$HOSTNAME/last
    if [ -r "$CHECKLOG/software.log" ] ; then
       # 1 errors during executing of commands
       # Unable to write mmap - msync (28 No space left on device)
@@ -388,16 +384,25 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
 
       # if we don't have an initrd we a) can't boot and b) there was an error
       # during build, so check for the file:
-      if [ -f "$CHROOT_OUTPUT"/boot/initrd* ] ; then
-         cp "$CHROOT_OUTPUT"/boot/initrd*  "$BUILD_OUTPUT"/boot/isolinux/initrd.gz
+      INITRD="$(ls $CHROOT_OUTPUT/boot/initrd* 2>/dev/null| grep -v '.bak$' | sort -r | head -1)"
+      if [ -n "$INITRD" ] ; then
+         cp $INITRD "$BUILD_OUTPUT"/boot/isolinux/initrd.gz
+         find $CHROOT_OUTPUT/boot/ -name initrd\*.bak -exec rm {} \;
       else
          log "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting"
          eerror "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1
          bailout 10
       fi
 
-      KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* | sort -r | head -1)"
-      cp "$KERNEL_IMAGE"                 "$BUILD_OUTPUT"/boot/isolinux/linux26
+      KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* 2>/dev/null | sort -r | head -1)"
+      if [ -n "$KERNEL_IMAGE" ] ; then
+         cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/isolinux/linux26
+      else
+         log "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting"
+         eerror "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1
+         bailout 11
+      fi
+
       cp /usr/lib/syslinux/chain.c32     "$BUILD_OUTPUT"/boot/isolinux/
       cp /usr/lib/syslinux/isolinux.bin  "$BUILD_OUTPUT"/boot/isolinux/
       cp /usr/lib/syslinux/memdisk       "$BUILD_OUTPUT"/boot/isolinux/
@@ -459,7 +464,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
                ( cd "$BUILD_OUTPUT"/windows
                  for file in pageant plink pscp psftp putty puttygen ; do
                     wget -O ${file}.exe ${WINDOWS_BINARIES}/${file}.exe
-                    md5sum ${WINDOWS_BINARIES}/${file}.exe > ${WINDOWS_BINARIES}/${file}.exe.md5
+                    md5sum ${file}.exe > ${file}.exe.md5
                  done )
             fi
          fi