Drop contrib + non-free from default COMPONENTS, support --contrib + -non-free cmdlin...

[grml-debootstrap.git] / config

diff --git a/config b/config
index 610dd4a..918b028 100644 (file)
--- a/config
+++ b/config
@@ -68,12 +68,12 @@
 # BACKPORTREPOS='yes'
 
 # Debian release that should be installed.
-# Supported values: lenny, squeeze, wheezy, sid
-# Default: 'wheezy'
-# RELEASE='wheezy'
+# Supported values: lenny, squeeze, wheezy, jessie, stretch, sid
+# Default: 'jessie'
+# RELEASE='jessie'
 
 # Define components that should be used within sources.list.
-# Default: 'main contrib non-free'
+# Default: 'main'
 # COMPONENTS='main contrib non-free'
 
 # Set target architecture.
@@ -154,6 +154,10 @@
 # Default: 'mkfs.ext4'
 # MKFS=''
 
+# Command line options for file system creation tool.
+# Default: no default.
+# MKFS_OPTS=''
+
 # Filesystem tuning tool to apply on $TARGET.
 # If empty, the created file system will not be tuned.
 # Default: 'tune2fs -c0 -i0' if ext* filesystem is used, no default otherwise.
@@ -175,10 +179,14 @@
 # Default: 'yes'
 # LOCALES='no'
 
-# locales that should be used as default.
+# locales (LANG) that should be used as default.
 # Default: 'en_US.UTF-8'
 # DEFAULT_LOCALES='en_US.UTF-8'
 
+# locales (LANGUAGE) that should be used as default.
+# Default: 'en_US:en'
+# DEFAULT_LANGUAGE='en_US:en'
+
 # Use /usr/share/zoneinfo/$TIMEZONE for /etc/localtime.
 # Default: 'Europe/Vienna'
 # TIMEZONE='Europe/Vienna'
@@ -206,4 +214,9 @@
 # Default: 'no'
 # FIXED_DISK_IDENTIFIERS='yes'
 
+# Disk identifier when using FIXED_DISK_IDENTIFIERS='yes'.
+# Use uuid-runtime's uuidgen tool to generate random UUIDs on demand.
+# Default: '26ada0c0-1165-4098-884d-aafd2220c2c6'
+# DISK_IDENTIFIER="$(uuidgen)"
+
 ## END OF FILE #################################################################