X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=6a4671bf4a9a8c319062371dbf8fb0f55bc99ed2;hb=24ba6903e8a89f03baf0c7ab46404261869f364f;hp=c7c6ff854a0f8ef5f5cd4dbba4bb44450fe4c368;hpb=f9b3683b3fc6373e72fefdf438c669691a4e2f74;p=grml-live.git

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index c7c6ff8..6a4671b 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -61,10 +61,10 @@
 # manually edit /etc/grml/fai/apt/sources.list but instead use $GRML_LIVE_SOURCES.
 # Use the variable as your /etc/apt/sources.list looks like.
 # GRML_LIVE_SOURCES="
-#deb http://192.168.1.112/debian     lenny        main contrib non-free
 #deb http://deb.grml.org/            grml-stable  main
 #deb http://deb.grml.org/            grml-testing main
-#deb http://ftp.de.debian.org/debian etch         main contrib non-free
+#deb http://192.168.1.112/debian     lenny     main contrib non-free
+#deb http://cdn.debian.net/debian etch         main contrib non-free
 #"
 
 # Which Debian suite and which mirror do you want to use for debootstrapping?
@@ -72,7 +72,7 @@
 # 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="lenny http://ftp.de.debian.org/debian"
+# FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian"
 
 # Do you want to use a local mirror (like NFS) as well?
 # If so specify the directory where debian/ is available:
@@ -106,6 +106,12 @@
 # Directory of configuration files for grml-live's FAI:
 # GRML_FAI_CONFIG=/etc/grml/fai
 
+# Do you want to put any local files into the chroot?
+# If so then point CHROOT_INSTALL to a directory providing the files.
+# Note: the files are installed under '/' in the chroot -
+# so you have to create the rootfs structure on your own.
+# CHROOT_INSTALL="$GRML_FAI_CONFIG/chroot_install"
+
 # Do you want to pass any additional arguments to FAI?
 # FAI_ARGS=""
 
@@ -151,6 +157,10 @@
 # HYBRID_METHOD='disable'   # do not create a hybrid ISO
 # HYBRID_METHOD='isohybrid' # use isohybrid instead of the default (being manifold)
 
+# Binary that should be used for creating the squashfs file.
+# Defaults to mksquashfs-lzma if available or falls back to mksquashfs.
+# SQUASHFS_BINARY='mksquashfs'
+
 # exclude files from compressed squashfs file using the
 # the mksquashfs option -ef:
 # SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"
@@ -161,4 +171,9 @@
 # URL for downloading the windows files:
 # WINDOWS_BINARIES="http://the.earth.li/~sgtatham/putty/latest/x86/"
 
+# Do you want to exit grml-live if some packages were requested for installation
+# on fresh installs but are missing on the generated ISO finally?
+# By default the package list is sent to stdout but grml-live doesn't interrupt.
+# EXIT_ON_MISSING_PACKAGES=1
+
 ## END OF FILE #################################################################