Do not include vmlinuz and initrd when building grml-small, initial support for SQUAS...

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 07c1bd8..fcb62c7 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -431,16 +431,6 @@ else
       # make sure new /etc/grml_version reaches the initramfs:
       chroot $CHROOT_OUTPUT update-initramfs -u -t
       eend $?
       # 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:
    fi
 
    # Remove all FAI logs from chroot if class RELEASE is used:


@@ -638,6 +628,16 @@ else
       fi
    fi
 
       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 \
    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 \