X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=970fa6bac975defcfe0077846b6580df03acebcb;hb=d26c9850526c4d4d276f27a4b041ea7d73262ab8;hp=a4a1fa83ade60083beece15097c30eca910e767b;hpb=2124a2fe0748887da88662abc5ce7c2c643120b8;p=grml-live.git diff --git a/grml-live b/grml-live index a4a1fa8..970fa6b 100755 --- a/grml-live +++ b/grml-live @@ -187,7 +187,7 @@ http://grml.org/bugs/ # command line parsing {{{ -while getopts "a:C:c:g:i:o:r:s:t:v:FhuV" opt; do +while getopts "a:C:c:g:i:o:r:s:t:v:FhuVz" opt; do case "$opt" in a) ARCH="$OPTARG" ;; c) CLASSES="$OPTARG" ;; @@ -207,6 +207,7 @@ while getopts "a:C:c:g:i:o:r:s:t:v:FhuV" opt; do h) usage ; bailout 0 ;; u) UPDATE=1 ;; V) VERBOSE="-v" ;; + z) SQUASHFS_ZLIB="-nolzma" ;; ?) echo "invalid option -$OPTARG" >&2; bailout 1 ;; esac done @@ -241,6 +242,7 @@ if [ -z "$FORCE" ] ; then [ -n "$FAI_ARGS" ] && echo " additional arguments for FAI: $FAI_ARGS" [ -n "$LOGFILE" ] && echo " Logging to file: $LOGFILE" [ -n "$VERBOSE" ] && echo " Using VERBOSE mode." + [ -n "$SQUASHFS_ZLIB" ] && echo " Using ZLIB (instead od LZMA) compression." [ -n "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation." echo echo -n "Is this ok for you? [y/N] " @@ -536,7 +538,7 @@ else # execute squashfs: log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend" - mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend + mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB log "Finished execution of stage 'squashfs' [$(date)]" einfo "Finished execution of stage 'squashfs'" ; eend 0 fi