X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=06e1e6c5f7fc7db46964f8472217ac6b468629f0;hp=af03a91aea0d90e5257ec5fc306788f48bf96036;hb=518eb395d8652ccf260e4fe6fc15af7946fc7c49;hpb=332ae52de9efa6a0ac5c3619823fe547e35828a0

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index af03a91..06e1e6c 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -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:
@@ -157,12 +157,17 @@
 # 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
+# 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.