X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=c0695631b88ac33a492af88c2eed2f330e7a0cc8;hp=78477f82ce638cef8a89a20d84567dbff1ae20ea;hb=81d68fd1cd4c828196882421dc42ec014007aa3f;hpb=c057283fb0e5e2b4e9f5f6b4293602be72de0eb8

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 78477f8..c069563 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:
@@ -49,7 +49,7 @@
 
 # Which Debian suite/release do you want to use?
 # Supported values are: stable, testing, unstable (or their corresponding release
-# names like "jessie").
+# names like "stretch").
 # Unless it is set it defaults to "testing".
 # SUITE="unstable"
 
@@ -66,7 +66,7 @@
 
 # Which Debian suite and which mirror do you want to use for debootstrapping?
 # Usage: "<suite> <mirror>"
-# FAI_DEBOOTSTRAP="jessie http://ftp.debian.org/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:
@@ -157,6 +157,13 @@
 # HYBRID_METHOD='grub2'     # use manifold with GRUB 2
 # HYBRID_METHOD='manifold'  # use manifold with ISOLINUX (default)
 
+# By default Secure Boot is enabled using the approach from Ubuntu.
+# Currently only the Ubuntu approach is supported, which is restricted
+# to loading Linux kernels and using a minimal version of GRUB.
+# If unset defaults to "ubuntu"
+# SECURE_BOOT='disable'         # do not enable Secure Boot
+# 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.
 # SQUASHFS_BINARY='mksquashfs'