X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=6107e28c3c965073426ecacc1aa1b87dbdf36636;hp=e0d55f4db227861de708a341fe831db9bb412782;hb=c78f58bfee79af61276e3e91457a1b0faa55bbf5;hpb=871fc96fc9b63665884b1e1429826d89a210200a

diff --git a/grml-live b/grml-live
index e0d55f4..6107e28 100755
--- a/grml-live
+++ b/grml-live
@@ -180,7 +180,10 @@ umount_all() {
    fi
 
    umount "${CHROOT_OUTPUT}/grml-live/sources/" 2>/dev/null || /bin/true
-   [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+   if [ -n "${MIRROR_DIRECTORY}" ]; then
+     umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+     rmdir -p "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+   fi
 }
 # }}}
 
@@ -974,7 +977,7 @@ grub_setup() {
           ;;
         *)
           log   "Secure Boot method '${SECURE_BOOT}' is unsupported."
-          error "Secure Boot method '${SECURE_BOOT}' is unsupported." ; eend 1
+          eerror "Secure Boot method '${SECURE_BOOT}' is unsupported." ; eend 1
           bailout 59
           ;;
       esac
@@ -1385,8 +1388,8 @@ else
 
    # use sane defaults if $SQUASHFS_OPTIONS isn't set
    if [ -z "$SQUASHFS_OPTIONS" ] ; then
-     # use blocksize 256k as this gives best result with regards to time + compression
-     SQUASHFS_OPTIONS="-b 256k"
+     # use block size 1m as this gives good result with regards to time + compression
+     SQUASHFS_OPTIONS="-b 1m"
 
      # set lzma/xz compression by default, unless -z option has been specified on command line
      if [ -z "$SQUASHFS_ZLIB" ] ; then