X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=393b974470405a8129c2a44c04bdde6fb459a515;hp=07c1bd8a7d9af7599e5399ec8af4d67afb946341;hb=c8546cb8d8d0870c6993343a7b5cfe27694cbf4e;hpb=a6f58a0d9badd6e771ba16162286b06be5839d9c diff --git a/grml-live b/grml-live index 07c1bd8..393b974 100755 --- a/grml-live +++ b/grml-live @@ -14,7 +14,7 @@ export LC_ALL=C # exit on any error: set -e -GRML_LIVE_VERSION='0.9.4' +GRML_LIVE_VERSION='0.9.5' PN="$(basename $0)" CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -431,16 +431,6 @@ else # make sure new /etc/grml_version reaches the initramfs: chroot $CHROOT_OUTPUT update-initramfs -u -t eend $? - # get rid of unnecessary files when building grml-small for final release: - if echo "$CLASSES" | grep -q GRML_SMALL && \ - echo "$CLASSES" | grep -q RELEASE ; then - einfo "Removing initrd and vmlinuz files in $CHROOT_OUTPUT/boot" - rm -f "$CHROOT_OUTPUT"/boot/initrd.img-* - rm -f "$CHROOT_OUTPUT"/boot/vmlinuz-* - eend $? - ewarn "Notice: you have to rebuild grml-small from scratch on next run." - eend 0 - fi fi # Remove all FAI logs from chroot if class RELEASE is used: @@ -638,6 +628,16 @@ else fi fi + # support exclusion of files via exclude-file: + if [ -n "$SQUASHFS_EXCLUDES_FILE" -a "$SQUASHFS_EXCLUDES_FILE" ] ; then + SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -ef $SQUASHFS_EXCLUDES_FILE" + fi + + # get rid of unnecessary files when building grml-small for final release: + if echo "$CLASSES" | grep -q GRML_SMALL ; then + SQUASHFS_OPTIONS="$SQUASHFS_OUTPUT -e initrd.img* vmlinuz*" + fi + SQUASHFS_OUTPUT="$(mktemp -t grml-live.XXXXXX)" log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/${GRML_NAME}.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB" if mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs \