X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=30b508ca0d43ce11231da90c973726e018e9d654;hb=7741716c921420a1c8d8d63e9eadf0c80a3b3b51;hp=5e648cb5802d273d0850089c8fd0b69c114b32e6;hpb=8491a6fb374e014854f8008ccb5ac75be4e38096;p=grml-live.git

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 5e648cb..30b508c 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -109,7 +109,7 @@
 # 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,12 +164,18 @@
 # *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 mksquashfs-lzma if available or falls back to mksquashfs.
+# 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.
+# SQUASHFS_OPTIONS='-b 256k'
+
 # exclude files from compressed squashfs file using the
 # the mksquashfs option -ef:
 # SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"
@@ -195,4 +201,7 @@
 # Do you want to skip the /conf/bootid.txt feature?
 # NO_BOOTID='1'
 
+# Do you want to add any additional bootoptions that should be used by default?
+# DEFAULT_BOOTOPTIONS="ssh=secret"
+
 ## END OF FILE #################################################################