grml-live: clean up MIRROR_DIRECTORY if provided.

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index e0d55f4..6107e28 100755 (executable)
--- 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