X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=64e50a43b0db41a96bc576a5c8e63d468de098b9;hb=02b32aa7fe4022fdefc80552539ecba4f1067492;hp=e3dc52834927742bca68da4bd5e7d927c2ae4722;hpb=e8c652b0062907ed9598e4fc1c887ee1e22e1d38;p=grml-live.git

diff --git a/grml-live b/grml-live
index e3dc528..64e50a4 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: Sat Sep 29 10:44:26 CEST 2007 [mika]
+# Latest change: Thu Oct 04 22:16:28 CEST 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -21,6 +21,12 @@ if [ "$(id -u 2>/dev/null)" != 0 ] ; then
    exit 1
 fi
 
+if [ -r /var/run/fai/FAI_INSTALLATION_IN_PROGRESS ] ; then
+   echo "/usr/sbin/fai already running or was aborted before."&>2
+   echo "You may remove /var/run/fai/FAI_INSTALLATION_IN_PROGRESS and try again.">&2
+   exit 1
+fi
+
 # make sure they are not set by default
 VERBOSE=''
 FORCE=''
@@ -63,9 +69,8 @@ trap bailout 1 2 3 15
 [ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
 [ -n "$GRML_NAME" ] || GRML_NAME='grml'
 
-[ -n "$LOGDIR" ] || LOGDIR="/var/log/fai/dirinstall/$HOSTNAME"
-[ -d "$LOGDIR" ] || mkdir -p $LOGDIR
-LOGFILE="$LOGDIR/grml-live.conf"
+[ -n "$LOGDIR" ] || LOGDIR="/var/log/"
+LOGFILE="$LOGDIR/grml-live.log"
 # }}}
 
 # some important functions {{{
@@ -295,7 +300,8 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       # booting stuff:
       mkdir -p "$BUILD_TARGET"/boot/isolinux
       cp /boot/memtest86+.bin                              "$BUILD_TARGET"/boot/isolinux/memtest
-      cp "$CHROOT_TARGET"/boot/initrd*                     "$BUILD_TARGET"/boot/isolinux/initrd.gz
+      # do not keep the initrd inside the chroot, let's save space instead:
+      mv "$CHROOT_TARGET"/boot/initrd*                     "$BUILD_TARGET"/boot/isolinux/initrd.gz
       cp "$CHROOT_TARGET"/boot/vmlinuz*                    "$BUILD_TARGET"/boot/isolinux/linux26
       cp /usr/lib/syslinux/chain.c32                       "$BUILD_TARGET"/boot/isolinux/
       cp /usr/lib/syslinux/isolinux.bin                    "$BUILD_TARGET"/boot/isolinux/
@@ -365,12 +371,12 @@ fi
 
 # create md5sum file:
 ( cd $BUILD_TARGET/GRML &&
-find .. -type f -not -name md5sums -exec md5sum {} \; > md5sums )
+find .. -type f -not -name md5sums -not -name isolinux.bin -exec md5sum {} \; > md5sums )
 # }}}
 
 # ISO_TARGET - mkisofs {{{
 [ -n "$ISO_TARGET" ] || ISO_TARGET="$TARGET/grml_isos"
-[ -n "$ISO_NAME" ] || ISO_NAME="$GRML_NAME_${VERSION}.iso"
+[ -n "$ISO_NAME" ] || ISO_NAME="${GRML_NAME}_${VERSION}.iso"
 
 if [ "$BOOT_METHOD" = "isolinux" ] ; then
    BOOT_FILE="boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"