From: Michael Prokop Date: Sun, 13 Jan 2008 13:29:09 +0000 (+0100) Subject: Merge branches X-Git-Tag: 0.1~1 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=f44a0326893ad30927009056ce7a706b11460327;hp=7c7b5c75595a5e6256d7c880ecee766f97fac611 Merge branches --- diff --git a/debian/changelog b/debian/changelog index c3e65cd..2319eee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -grml-live (0.0.15) unstable; urgency=low +grml-live (0.1) unstable; urgency=low + * Bump version number to 0.1 as we ship grml-live with the + upcoming stable versions. * Use /usr/bin/vim.tiny as alternativ for vi. * Add new packages to GRML_FULL: - at76-usb-modules-2.6.23-grml64 @@ -20,7 +22,7 @@ grml-live (0.0.15) unstable; urgency=low * /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot: remove packages via dpkg instead of apt-get. Thanks for the bugreport and the patch, Lupe Christoph! [Closes: issue367] - * Add SQUASHFS_ZLIB template to grml-live.conf. + * Use -no-progress option for mksquashfs only if it's supported. -- Michael Prokop Fri, 11 Jan 2008 01:56:01 +0100 diff --git a/docs/grml-live.txt b/docs/grml-live.txt index c94dc74..c7509af 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -17,7 +17,7 @@ grml-live [-a ] [-c ] [-g ] [-i ] ******************************************************************************* Important! This document is growing as requested. If you have questions which aren't answered by this document yet please let me know: ! -This document currently applies to grml-live version 0.0.14. +This document currently applies to grml-live version 0.1. ******************************************************************************* Description @@ -58,9 +58,11 @@ Options -a **ARCHITECTURE**:: Use the specified architecture instead of the currently running one. This -allows building a 32bit system on a 64bit host. Please notice that real +allows building a 32bit system on a 64bit host (though you can't build a 64bit +system on a 32bit system/kernel of course). Please notice that real crosscompiling (like building a ppc system on x86) isn't possible due to the -nature and the need of working in a chroot. +nature and the need of working in a chroot. Currently supported values: i386 +and amd64. -b:: @@ -163,6 +165,11 @@ To get a small Debian-unstable and grml-small based Live-CD using # grml-live -c GRMLBASE,GRML_SMALL,I386 -o /home/mika/grml-live +To get a medium sized, Debian-unstable and grml-based Live-CD for i386 +architecture using /grml/grml-live as build and output directory just run: + + # grml-live -a i386 -c GRMLBASE,GRML_MEDIUM,I386 + To get a small, Debian-unstable and grml-based Live-CD using /tmp as build and output directory and use grml_0.0-3.iso as ISO name (placed inside /tmp/grml_isos) just invoke: @@ -175,7 +182,7 @@ If you have about 700MB of free space inside /dev/shm (being a tmpfs, usually you should have >=1GB of RAM) just run "mount -o remount,suid,dev,rw /dev/shm" and use /dev/shm as build and output directory - resulting in very fast build process. But please be aware of the fact that rebooting your system will result -in an empty /dev/shm, so please another directory for $CHROOT_OUTPUT, +in an empty /dev/shm, so please use another directory for $CHROOT_OUTPUT, $BUILD_OUTPUT and $ISO_OUTPUT if you plan to create more persistent output. :) Main features of grml-live diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index d3ead56..ed2933f 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -72,10 +72,6 @@ CLASSES="GRMLBASE,GRML_MEDIUM,I386" # ... and the sources.list entry for the directory: # MIRROR_SOURCES="deb file:///mnt/mirror/debian sid main contrib non-free" -# Use ZLIB instead of LZMA compression? Faster and available in older -# squashfs versions as well but not such a good compression. -# SQUASHFS_ZLIB=1 - # Version number of ISO: VERSION="0.0-1" diff --git a/grml-live b/grml-live index 0f26205..ab0b1c1 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Fri Jan 11 02:00:39 CET 2008 [mika] +# Latest change: Fre Jän 11 09:09:02 CET 2008 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -15,7 +15,7 @@ export LC_ALL=C # exit on any error: set -e -GRML_LIVE_VERSION='0.0.15' +GRML_LIVE_VERSION='0.1' CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -547,8 +547,13 @@ else [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz" # execute squashfs: - log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress" - mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB + if mksquashfs --help 2>&1 | grep -- -no-progress ; then + log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress" + mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB + else + log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend" + mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB + fi log "Finished execution of stage 'squashfs' [$(date)]" einfo "Finished execution of stage 'squashfs'" ; eend 0 fi