X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=659e22c1256b24b32eb728e09d8e588bb3fdc97a;hp=e4aad8b059dd25bc0e2dee95a5f54cd5e2029d64;hb=4bc574e7d476abde7c9d8d38e1d749e2c8eb67e6;hpb=3e43f6558cec07e1396e907fae94eb2c7b6d4157

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index e4aad8b..659e22c 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -24,11 +24,20 @@
 # Where do you want to find the final ISO?
 # ISO_OUTPUT="$OUTPUT/grml_isos"
 
-# Do you want to zero / clean up the logfile on each grml-live execution?
-# Especially useful if you are using an autobuild setup where you want
-# store /var/log/grml-live.log after each invocation of grml-live.
-# Default: unset (so do not zero the logfile)
-# ZERO_LOGFILE='1'
+# Do you want to preserve the logfile from being cleaned after each execution
+# of grml-live? By default the logfile is cleaned so the log doesn't fill up.
+# If you want to store your logs permanently it's recommended to use grml-live-db.
+# PRESERVE_LOGFILE='1'
+
+# If package grml-live-db is installed the package selection and grml-live.log
+# are being logged to to a sqlite database.Defaults to /var/log/grml-live.db
+# DPKG_DATABASE=/var/log/grml-live.db
+
+# Use your own database wrapper script for grml-live-db:
+# DPKG_DBSCRIPT=/usr/share/grml-live-db/scripts/dpkg-to-db
+
+# Use your own database script cmdline options for grml-live-db:
+# DPKG_DBOPTIONS="-d $DPKG_DATABASE --logfile $LOGFILE --flavour $GRML_NAME < $DPKG_LIST"
 
 # Do you want to zero / clean up / remove the previous logfiles of FAI
 # before executing grml-live? Otherwise keep all the logfiles inside
@@ -36,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?#
 
@@ -72,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:
@@ -100,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:
@@ -155,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"
@@ -171,4 +186,22 @@
 # URL for downloading the windows files:
 # WINDOWS_BINARIES="http://the.earth.li/~sgtatham/putty/latest/x86/"
 
+# Do you want to exit grml-live if some packages were requested for installation
+# on fresh installs but are missing on the generated ISO finally?
+# By default the package list is sent to stdout but grml-live doesn't interrupt.
+# EXIT_ON_MISSING_PACKAGES=1
+
+# Do you want to use a special string for identifying the ISO?
+# By default the grml-name and version string are used as a base for generating
+# /conf/bootid.txt on the ISO. If you want to use a different value feel free to
+# adjust it accordingly.
+# Please notice that space characters inside this variable are not supported.
+# BOOTID="mybootid"
+
+# 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 #################################################################