Drop options=header from docs/grml-live.txt so it builds with old asciidoc version...

[grml-live.git] / docs / grml-live.txt

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index fb27bc0..f6c231d 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,39 +506,46 @@ 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
-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).
+squashfs-lzma-tools 4.0-2 is available via the grml repositories. It provides
+the mksquashfs-lzma and unsquashfs-lzma binaries. The package does NOT conflict
+with Debian's squashfs-tools package (you can install both of them at the same
+time).

 
 The packages can be downloaded from
 link:http://deb.grml.org/pool/main/s/squashfs-lzma-tools/[http://deb.grml.org/pool/main/s/squashfs-lzma-tools/]
 
 It provides support for the new squashfs file format version 4 and therefore
 
 The packages can be downloaded from
 link:http://deb.grml.org/pool/main/s/squashfs-lzma-tools/[http://deb.grml.org/pool/main/s/squashfs-lzma-tools/]
 
 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.
+requires kernel versions newer than 2.6.28-grml[64]. It supports LZMA as well as
+ZLIB compression. Just use the defaults for enabling LZMA or use grml-live's
+'-z' option if you want to use ZLIB 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.31-grml[64]: works
 
 
 * 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
 

+////////////////////////////////////////////////////////////////////////////////
+[IMPORTANT]
+
+Do NOT use a blocksize different than the default (131072 / 128kb).  The kernel
+will very probably oops then - so please do not touch the '-b' option of
+mksquashfs.
+////////////////////////////////////////////////////////////////////////////////
+

 [NOTE]
 [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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 squashfs-tools 1:4.0-1 is available in Debian/unstable and Debian/testing. It
 
 Using squashfs-tools 1:4.0-1 on the build system
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 squashfs-tools 1:4.0-1 is available in Debian/unstable and Debian/testing. It

-provides the mksquashfs and unsquashfs binaries and the package does NOT
-conflict with the squashfs-lzma-tools 4.0-1 package (you can install both of
+provides the mksquashfs and unsquashfs binaries. The package does NOT
+conflict with the squashfs-lzma-tools 4.0-2 package (you can install both of

 them at the same time).
 
 The packages can be downloaded from
 them at the same time).
 
 The packages can be downloaded from


@@ -547,15 +555,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.
+Grml's 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 +762,43 @@ 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?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ISO size (bs = blocksize):
+
+[width="45%",cols="3,^2,^2,^2"]
+|============================================================
+|ISO                   |LZMA (256kB bs) |LZMA (128kB bs)|ZLIB
+|grml_sid              |666M | WIP | 771M
+|grml_squeeze          |659M | WIP | 761M
+|grml_lenny            |624M | WIP | 723M
+|grml64_sid            |677M | WIP | 791M
+|grml64_squeeze        |671M | WIP | 785M
+|grml64_lenny          |639M | WIP | 745M
+|grml-medium_sid       |208M | WIP | 236M
+|grml-medium_squeeze   |206M | WIP | 234M
+|grml-medium_lenny     |193M | WIP | 220M
+|grml64-medium_sid     |213M | WIP | 245M
+|grml64-medium_squeeze |213M | WIP | 244M
+|grml64-medium_lenny   |201M | WIP | 231M
+|grml-small_sid        |102M | WIP | 118M
+|grml-small_squeeze    |101M | WIP | 117M
+|grml-small_lenny      |97M  | WIP | 112M
+|grml64-small_sid      |103M | WIP | 120M
+|grml64-small_squeeze  |103M | WIP | 120M
+|grml64-small_lenny    |99M  | WIP | 116M
+|============================================================
+
+Build time of grml-medium's squashfs file (depends on your system, though just
+to get the ratio between the different options):
+
+* 10 minutes and 4 seconds with LZMA default blocksize (128k)
+* 7 minutes 27 seconds with LZMA and blocksize 256k
+* 6 minutes and 8 seconds with LZMA blocksize 512k
+* 1 minute and 40 seconds with ZLIB
+

 [[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?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~