X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=2586fd042a8641a370326acc58b3d82370f71b4f;hb=bcf093e5799a9011672401590beaa28833801f94;hp=3dbb7e0ff35edd18658690d4b0c35f25d52fa1df;hpb=a99823da6b09fcb97633a62ca48ec15ed87d1955;p=grml-live.git

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 3dbb7e0..2586fd0 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -45,11 +45,11 @@
 # Default: unset (so do not remove the logfile(s))
 # ZERO_FAI_LOGFILE='1'
 
-# Which Debian suite to you want to use? Unless it is set it defaults to "lenny"
-# Supported values are: etch, lenny, sid
+# Which Debian suite to you want to use? Unless it is set it defaults to "squeeze"
+# Supported values are: etch, lenny, sid,
 #                       squeeze -> requires /etc/grml/fai/config/basefiles/....tar.gz
 #                                  or a recent version of debootstrap
-# SUITE="lenny"
+# SUITE="squeeze"
 
 # Which FAI classes do you want to use by default?#
 
@@ -81,7 +81,7 @@
 # taken. If you specify a value then the file /etc/grml/fai/make-fai-nfsroot.conf
 # will be updated by grml-live on-the-fly.
 # Usage: "<suite> <mirror>"
-# FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian"
+# FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian"
 
 # Do you want to use a local mirror (like NFS) as well?
 # If so specify the directory where debian/ is available:
@@ -105,11 +105,8 @@
 # Specify user with UID 1000 on live-system:
 # USERNAME=grml
 
-# Specify options for Squashfs build stage (running mksquashfs):
-# SQUASHFS_OPTIONS="-nolzma"
-
 # Which bootloader do you want to use? Default: isolinux
-# Supported values: isolinux, grub
+# Supported values: isolinux, grub, grub2
 # BOOT_METHOD='isolinux'
 
 # Directory of configuration files for grml-live's FAI:
@@ -164,14 +161,16 @@
 # *without* having to run grml2usb (like: 'dd if=grml.iso of=/dev/sdX')
 # - working both with the same ISO
 # HYBRID_METHOD='disable'   # do not create a hybrid ISO
-# HYBRID_METHOD='isohybrid' # use isohybrid instead of the default (being manifold)
+# HYBRID_METHOD='isohybrid' # use isohybrid from SYSLINUX
+# HYBRID_METHOD='grub2'     # use manifold with GRUB 2
+# HYBRID_METHOD='manifold'  # use manifold with ISOLINUX (default)
 
 # Binary that should be used for creating the squashfs file.
 # Defaults to the executable matching the kernel version, falls back to mksquashfs.
 # SQUASHFS_BINARY='mksquashfs'
 
 # Options that should be used by mksquashfs during build process.
-# Defaults to '-b 256k' and the according LZMA option.
+# Defaults to '-b 256k' and the according LZMA/XZ option.
 # SQUASHFS_OPTIONS='-b 256k'
 
 # exclude files from compressed squashfs file using the