Use iceweasel/firefox as x-www-browser and w3m as www-browser

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 2c7abcf..64e50a4 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -69,8 +69,7 @@ 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
+[ -n "$LOGDIR" ] || LOGDIR="/var/log/"
 LOGFILE="$LOGDIR/grml-live.log"
 # }}}
 
@@ -301,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/