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

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index c069563..c84f588 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -152,17 +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)
-
-# 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
+# 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.