X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=fcb62c769b868ccba3e397de9fe969cf90657c9a;hb=a4b17e9e0ac5de3771ae935ae32d4391dbbf065c;hp=2694a25e37379c65d7b41dd290362f5aa59ef654;hpb=8e73764ca7533f8250a1611756c13c54c7059da1;p=grml-live.git

diff --git a/grml-live b/grml-live
index 2694a25..fcb62c7 100755
--- a/grml-live
+++ b/grml-live
@@ -431,13 +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:
-      if echo "$CLASSES" | grep -q GRML_SMALL ; 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 $?
-      fi
    fi
 
    # Remove all FAI logs from chroot if class RELEASE is used:
@@ -635,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 \