X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=37806ddb43079100a266e74f4fab8577c05c6d06;hp=b1900ac55ae078f88f217d362355e609e31d016a;hb=d0a25f748a39de2d03c421eefbf0938ee09a20a2;hpb=a82816a15afb502e9b72bc9de4c967fa1061c08b diff --git a/grml-live b/grml-live index b1900ac..37806dd 100755 --- a/grml-live +++ b/grml-live @@ -23,7 +23,7 @@ fi set -e # global variables -GRML_LIVE_VERSION='0.12.5' +GRML_LIVE_VERSION='0.13.1' PN="$(basename $0)" CMDLINE="$0 $@" SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list' @@ -59,7 +59,7 @@ Usage: $PN [options, see as follows] -u update existing chroot instead of rebuilding it from scratch -v specify version number of the release -V increase verbosity in the build process - -z use ZLIB instead of LZMA compression + -z use ZLIB instead of LZMA/XZ compression Usage examples: @@ -257,7 +257,7 @@ shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter [ -n "$NFSROOT_CONF" ] || NFSROOT_CONF='/etc/grml/fai/make-fai-nfsroot.conf' [ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks' [ -n "$SQUASHFS_EXCLUDES_FILE " ] || SQUASHFS_EXCLUDES_FILE='/etc/grml/fai/squashfs-excludes' -[ -n "$SUITE" ] || SUITE='lenny' +[ -n "$SUITE" ] || SUITE='squeeze' [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates' [ -n "$USERNAME" ] || USERNAME='grml' [ -n "$VERSION" ] || VERSION='0.0.1' @@ -322,7 +322,7 @@ if [ -z "$FORCE" ] ; then [ -n "$DEFAULT_BOOTOPTIONS" ] && echo " Adding default bootoptions: \"$DEFAULT_BOOTOPTIONS\"" [ -n "$FAI_ARGS" ] && echo " Additional arguments for FAI: $FAI_ARGS" [ -n "$LOGFILE" ] && echo " Logging to file: $LOGFILE" - [ -n "$SQUASHFS_ZLIB" ] && echo " Using ZLIB (instead of LZMA) compression." + [ -n "$SQUASHFS_ZLIB" ] && echo " Using ZLIB (instead of LZMA/XZ) compression." [ -n "$SQUASHFS_OPTIONS" ] && echo " Using SQUASHFS_OPTIONS ${SQUASHFS_OPTIONS}" [ -n "$VERBOSE" ] && echo " Using VERBOSE mode." [ -n "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation." @@ -967,9 +967,9 @@ else # use blocksize 256k as this gives best result with regards to time + compression SQUASHFS_OPTIONS="-b 256k" - # set lzma compression by default, unless -z option has been specified on command line + # set lzma/xz compression by default, unless -z option has been specified on command line if [ -z "$SQUASHFS_ZLIB" ] ; then - SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -comp lzma" + SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -comp xz" fi fi