X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=1f9e3baac2190ce51d20d1a280425c6f1acb5dba;hp=112e91ea8eb2e5a8ac390a6b1b7f31972ce6fdd1;hb=HEAD;hpb=94aafe9bb2f37e135ca842c15e7db0680afa8305

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 112e91e..6762ff7 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 "bookworm").
 # Unless it is set it defaults to "testing".
 # SUITE="unstable"
 
@@ -58,7 +58,7 @@
 # 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
 # or GRML_FULL) to get an according kernel and also select the
-# architecture (I386 for x86; AMD64 for x86_64)
+# architecture (I386 for x86; AMD64 for x86_64, ARM64 for arm64)
 # CLASSES="GRMLBASE,GRML_FULL,I386"
 
 # HTTP Proxy to use for APT
@@ -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="bookworm http://ftp.debian.org/debian"
 
 # Do you want to use a local mirror (like NFS)?
 # If so specify the directory where debian/ is available:
@@ -74,8 +74,7 @@
 # ... and then set up an according class file in
 # ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/
 # containing something like:
-# deb file:///media/mirror/debian sid main contrib non-free
-MIRROR_DIRECTORY="/home/evgeni/local-packages"
+# deb file:///media/mirror/debian sid main contrib non-free-firmware non-free
 
 # Version number of ISO:
 # VERSION="0.0-1"
@@ -153,18 +152,32 @@ MIRROR_DIRECTORY="/home/evgeni/local-packages"
 # 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.
 # SQUASHFS_BINARY='mksquashfs'
 
 # Options that should be used by mksquashfs during build process.
-# Defaults to '-b 256k' and the according LZMA/XZ option.
-# SQUASHFS_OPTIONS='-b 256k'
+# Defaults to '-b 1m' and the according LZMA/XZ option.
+# SQUASHFS_OPTIONS='-b 1m'
 
 # exclude files from compressed squashfs file using the
 # the mksquashfs option -ef: