Update documentation and changelog

diff --git a/debian/changelog b/debian/changelog
index db9920a..7d4cd08 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 grml-live (0.9.23) UNRELEASED; urgency=low
 
 grml-live (0.9.23) UNRELEASED; urgency=low
 

-  * Add backwards compability check for old sources.list layout
+  * Add backwards compatibility check for old sources.list layout

     (we're using /etc/apt/sources.list.d now) to script
     /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
   * GRML_SMALL, GRML_MEDIUM and GRML_FULL: switch from kernel
     (we're using /etc/apt/sources.list.d now) to script
     /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
   * GRML_SMALL, GRML_MEDIUM and GRML_FULL: switch from kernel


@@ -8,8 +8,9 @@ grml-live (0.9.23) UNRELEASED; urgency=low
   * Assume 'lenny' as default SUITE instead of 'stable' as
     debootstrap doesn't know how to handle 'stable'.
     Thanks to Ulrich Dangel.
   * Assume 'lenny' as default SUITE instead of 'stable' as
     debootstrap doesn't know how to handle 'stable'.
     Thanks to Ulrich Dangel.

+  * Use blocksize of 256 when running mksquashfs-lzma binary.

 
 

- -- Michael Prokop <mika@grml.org>  Thu, 10 Sep 2009 00:54:46 +0200
+ -- Michael Prokop <mika@grml.org>  Fri, 11 Sep 2009 02:53:25 +0200

 
 grml-live (0.9.22) unstable; urgency=low
 
 
 grml-live (0.9.22) unstable; urgency=low
 

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index fb27bc0..fc8ec2b 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -493,7 +493,8 @@ version 3
 * squashfs-tools 1:3.2r2-9exp1: LZMA as default, ZLIB support via -nolzma
 option, file format version 3
 
 * squashfs-tools 1:3.2r2-9exp1: LZMA as default, ZLIB support via -nolzma
 option, file format version 3
 

-* squashfs-lzma-tools 4.0-1: LZMA as default, no ZLIB support/options, file format 4
+* squashfs-lzma-tools 4.0-2: ZLIB as default, LZMA support via -lzma option,
+file format version 4

 
 * squashfs-lzma-tools 3.3-1: LZMA as default, ZLIB support via -nolzma option,
 file format version 3
 
 * squashfs-lzma-tools 3.3-1: LZMA as default, ZLIB support via -nolzma option,
 file format version 3


@@ -505,10 +506,10 @@ the recent integration of squashfs file format 4 in the mainline kernel. Support
 for LZMA is pending and should dramatically simplify the situation for
 developers as well as users as soon as it's available mainline.
 
 for LZMA is pending and should dramatically simplify the situation for
 developers as well as users as soon as it's available mainline.
 

-Using squashfs-lzma-tools 4.0-1 on the build system
+Using squashfs-lzma-tools 4.0-2 on the build system

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

-squashfs-lzma-tools 4.0-1 is available via the grml repositories. It provides
+squashfs-lzma-tools 4.0-2 is available via the grml repositories. It provides

 the mksquashfs-lzma and unsquashfs-lzma binaries and the package does NOT
 conflict with the squashfs-tools package (you can install both of them at the
 same time).
 the mksquashfs-lzma and unsquashfs-lzma binaries and the package does NOT
 conflict with the squashfs-tools package (you can install both of them at the
 same time).


@@ -519,18 +520,14 @@ link:http://deb.grml.org/pool/main/s/squashfs-lzma-tools/[http://deb.grml.org/po
 It provides support for the new squashfs file format version 4 and therefore
 requires kernel versions newer than 2.6.28-grml[64].
 
 It provides support for the new squashfs file format version 4 and therefore
 requires kernel versions newer than 2.6.28-grml[64].
 

-It does NOT provide support for ZLIB compression. If you need ZLIB support
-please use squashfs-tools 1:4.0-1 instead and use the '-z' option of grml-live
-or set "SQUASHFS_OPTIONS='-nolzma'" in the grml-live configuration file.
-

 * Kernel 2.6.23-grml[64]: does not work
 * Kernel 2.6.26-grml[64]: does not work
 * Kernel 2.6.28-grml[64]: does not work
 * Kernel 2.6.31-grml[64]: works
 
 [NOTE]
 * Kernel 2.6.23-grml[64]: does not work
 * Kernel 2.6.26-grml[64]: does not work
 * Kernel 2.6.28-grml[64]: does not work
 * Kernel 2.6.31-grml[64]: works
 
 [NOTE]

-Please use squashfs-lzma-tools 4.0-1 if you want to remaster grml releases
-MORE RECENT than 2009.05 using the LZMA compression.
+Please use squashfs-lzma-tools >=4.0-2 from Grml if you want to remaster any
+grml release being MORE RECENT than 2009.05.

 
 Using squashfs-tools 1:4.0-1 on the build system
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Using squashfs-tools 1:4.0-1 on the build system
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


@@ -547,15 +544,15 @@ It provides support for the new squashfs file format version 4 and therefore
 requires kernel versions newer than 2.6.28-grml[64].
 
 It does NOT support LZMA compression. If you need LZMA support please use
 requires kernel versions newer than 2.6.28-grml[64].
 
 It does NOT support LZMA compression. If you need LZMA support please use

-squashfs-lzma-tools instead.
+squashfs-lzma-tools (see section above) instead.

 
 * Kernel 2.6.23-grml[64]: does not work
 * Kernel 2.6.26-grml[64]: does not work
 * Kernel 2.6.28-grml[64]: does not work
 
 * Kernel 2.6.23-grml[64]: does not work
 * Kernel 2.6.26-grml[64]: does not work
 * Kernel 2.6.28-grml[64]: does not work

-* Kernel 2.6.31-grml[64]: supposed to work (verification in progress)
+* Kernel 2.6.31-grml[64]: works

 
 [NOTE]
 
 [NOTE]

-Please use squashfs-tools 1:4.0-1 if you want to remaster grml releases
+Please use squashfs-tools 1:4.0-1 only if you want to remaster grml releases

 MORE RECENT than 2009.05 using the ZLIB compression.
 
 Using squashfs-lzma-tools 3.3-1 on the build system
 MORE RECENT than 2009.05 using the ZLIB compression.
 
 Using squashfs-lzma-tools 3.3-1 on the build system


@@ -754,6 +751,35 @@ If you need help with grml-live or would like to see new features as part of
 grml-live you can get commercial support via
 link:http://grml-solutions.com/[Grml Solutions].
 
 grml-live you can get commercial support via
 link:http://grml-solutions.com/[Grml Solutions].
 

+[[lzma-vs-zlib]]
+How much is the difference between LZMA and ZLIB compression?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Note: LZMA sizes is work in progress.
+
+[width="40%",cols="3,^2,^2",options="header"]
+|==================================
+|ISO                   |LZMA |ZLIB
+|grml64_lenny          |X    |745M
+|grml64-medium_lenny   |X    |231M
+|grml64-medium_sid     |X    |245M
+|grml64-medium_squeeze |X    |244M
+|grml64_sid            |X    |791M
+|grml64-small_lenny    |X    |116M
+|grml64-small_sid      |X    |120M
+|grml64-small_squeeze  |X    |120M
+|grml64_squeeze        |X    |785M
+|grml_lenny            |X    |723M
+|grml-medium_lenny     |X    |220M
+|grml-medium_sid       |X    |236M
+|grml-medium_squeeze   |X    |234M
+|grml_sid              |X    |771M
+|grml-small_lenny      |X    |112M
+|grml-small_sid        |X    |118M
+|grml-small_squeeze    |X    |117M
+|grml_squeeze          |X    |761M
+|==================================
+

 [[install-local-files]]
 How to I install further files into the chroot/ISO?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 [[install-local-files]]
 How to I install further files into the chroot/ISO?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/grml-live b/grml-live
index 66075e8..0af9d7a 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -892,7 +892,7 @@ else
 
             # if we still want to use mksquashfs-lzma then let's choose
             # blocksize 256k as this gives best result with regards to time + comopression
 
             # if we still want to use mksquashfs-lzma then let's choose
             # blocksize 256k as this gives best result with regards to time + comopression

-            [[ "$SQUASHFS_BINARY" == "mksquashfs-lzma" ]] && SQUASHFS_OPTIONS="-b 256k"
+            [[ "$SQUASHFS_BINARY" == "mksquashfs-lzma" ]] && SQUASHFS_OPTIONS="-b 256k -lzma"

          fi
 
       fi
          fi
 
       fi