docs/livecd-creator.pod tools/livecd-creator

[Bruno Wolff III]

docs/livecd-creator.pod |    9 +++++----
 tools/livecd-creator    |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit a951443c11ccae3aeef17f9530d7154678aebf9a
Author: Bruno Wolff III 
Date:   Sat Jan 15 23:14:52 2011 -0600

Update documentation for xz availability.

diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod
index dd70fb9..63ea88b 100644
--- a/docs/livecd-creator.pod
+++ b/docs/livecd-creator.pod
@@ -42,10 +42,11 @@ Defines the file system label. The default is based on the configuration name.

=item --compression-type=COMPRESSOR

-Specify a compressor recognized by mksquashfs. The default is gzip. lzma
-currently requires a custom kernel to produce a functional image. lzo works with 2.6.36+ kernels, but will generally take up more space than using gzip. If gzip
-is used, the -comp option is not passed to mksquashfs to allow the use of
-older versions of mksquashfs.
+Specify a compressor recognized by mksquashfs.
+gzip is the default and should work with all kernels.
+lzo works with 2.6.36 and later kernels.
+xz works with 2.6.38 and later kernels. lzma will only work with custom kernels.
+If gzip is used, the -comp option is not passed to mksquashfs to allow the use of older versions of mksquashfs.

=item --releasever=VER

diff --git a/tools/livecd-creator b/tools/livecd-creator
index 18c50cd..85d74eb 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -48,7 +48,7 @@ def parse_options(args):
     imgopt.add_option("", "--image-type", type="string", dest="image_type",
                       help=optparse.SUPPRESS_HELP)
     imgopt.add_option("", "--compression-type", type="string", dest="compress_type",
-                      help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel, lzo needs a 2.6.36+ kernel)",
+                      help="Compression type recognized by mksquashfs (default gzip, xz needs a 2.6.38+ kernel, lzo needs a 2.6.36+ kernel, lzma needs custom kernel)",
                       default="gzip")
     imgopt.add_option("", "--releasever", type="string", dest="releasever",
                       default=None,