Switch order of mirror configuration in example config

[grml-live.git] / etc / grml / grml-live.conf

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index e4af5c2..e4aad8b 100644 (file)
--- 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:
@@ -157,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"