X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=c84f588253ccb5ead5db389217346c8192faccd2;hp=3923936e3f43ac2e2f6ce2fe2340673b5f33f207;hb=aa74c00b81b8b2e6dcaaa2401e1defd1525d11b2;hpb=b0f14af53e9c397e5809583f9d69fd804e9d08bc

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 3923936..c84f588 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -13,7 +13,7 @@
 
 # Main output directory
 # Please notice that you need suid,dev,rw permissions there
-# OUTPUT="/grml/grml-live"
+# OUTPUT="./grml/"
 # You have enough RAM? Use shared memory for fast testing-purposes:
 # OUTPUT="/dev/shm" # mount -o remount,suid,dev,rw /dev/shm
 
@@ -32,7 +32,7 @@
 # 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
+# are being logged 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:
@@ -47,17 +47,17 @@
 # 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 "squeeze"
-# Supported values are: etch, lenny, sid,
-#                       squeeze -> requires /etc/grml/fai/config/basefiles/....tar.gz
-#                                  or a recent version of debootstrap
-# SUITE="squeeze"
+# Which Debian suite/release do you want to use?
+# Supported values are: stable, testing, unstable (or their corresponding release
+# names like "stretch").
+# Unless it is set it defaults to "testing".
+# SUITE="unstable"
 
 # Which FAI classes do you want to use by default?#
 
 # Notice: GRMLBASE is recommended in any case unless you *really* know what you
-# are doing; make sure to also use a GRML_* class (for example GRML_SMALL,
-# GRML_MEDIUM or GRML_FULL) to get an according kernel and also select the
+# are doing; make sure to also use a GRML_* class (for example GRML_SMALL
+# or GRML_FULL) to get an according kernel and also select the
 # architecture (I386 for x86; AMD64 for x86_64)
 # CLASSES="GRMLBASE,GRML_FULL,I386"
 
@@ -65,19 +65,16 @@
 # APT_PROXY="http://localhost:3142/"
 
 # Which Debian suite and which mirror do you want to use for debootstrapping?
-# Unless specified the default from /etc/grml/fai/make-fai-nfsroot.conf will be
-# 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="squeeze http://cdn.debian.net/debian"
+# FAI_DEBOOTSTRAP="stretch http://ftp.debian.org/debian"
 
 # Do you want to use a local mirror (like NFS)?
 # If so specify the directory where debian/ is available:
-# MIRROR_DIRECTORY="/mnt/mirror"
+# MIRROR_DIRECTORY="/media/mirror"
 # ... and then set up an according class file in
 # ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/
 # containing something like:
-# deb file:///mnt/mirror/debian sid main contrib non-free
+# deb file:///media/mirror/debian sid main contrib non-free
 
 # Version number of ISO:
 # VERSION="0.0-1"
@@ -136,6 +133,11 @@
 # likes the default directory [/usr/share/grml-live/templates]
 # TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
 
+# Use custom scripts, for example for bootgrub.mksh?
+# Useful when running grml-live from git checkout.
+# If unset defaults to /usr/share/grml-live/scripts
+# SCRIPTS_DIRECTORY='/usr/share/grml-live/scripts'
+
 # Do you want to use console based isolinux boot splash
 # instead of the default graphical menu?
 # ISOLINUX_METHOD="console"
@@ -150,10 +152,24 @@
 # boot the CD using normal el torito mode or copy it to USB device
 # *without* having to run grml2usb (like: 'dd if=grml.iso of=/dev/sdX')
 # - working both with the same ISO
+# Note that the manifold method is currently not be compatible with UEFI
+# setups.
 # HYBRID_METHOD='disable'   # do not create a hybrid ISO
-# HYBRID_METHOD='isohybrid' # use isohybrid from SYSLINUX
+# HYBRID_METHOD='isohybrid' # use isohybrid from SYSLINUX (default)
 # HYBRID_METHOD='grub2'     # use manifold with GRUB 2
-# HYBRID_METHOD='manifold'  # use manifold with ISOLINUX (default)
+# HYBRID_METHOD='manifold'  # use manifold with ISOLINUX
+
+# Secure Boot method that should be used (amd64 only).
+# If unset defaults to "disabled" (which means no Secure Boot will be present)
+# The following approaches are supported:
+# debian: use the Debian GRUB version which requires a signed kernel,
+#         this is the recommended way to use Secure Boot with Grml
+# ubuntu: use an older Ubuntu GRUB version which doesn't require a signed kernel,
+#         though has a limited feature set only and requires customized GRUB
+#         templates (the files shipped templates/boot/grub/ don't work as such)
+# SECURE_BOOT='disable'         # do not enable Secure Boot (default)
+# SECURE_BOOT='debian'          # use approach from Debian
+# SECURE_BOOT='ubuntu'          # use approach from Ubuntu
 
 # Binary that should be used for creating the squashfs file.
 # Defaults to the executable matching the kernel version, falls back to mksquashfs.