use --package-lists instead of --kanotix-flavours

2 files changed, 3 insertions, 16 deletions

diff --git a/auto/config b/auto/config
index 0b7ed72..008ef18 100755
--- a/auto/config
+++ b/auto/config
@@ -8,6 +8,9 @@ MIRROR_BOOTSTRAP="$MIRROR_CHROOT"
 
 . auto/kanotix
 
+# preset default packages list
+export LB_PACKAGES_LISTS="kanotix-master"
+
 lb config noauto \
 	--iso-volume KANOTIX \
 	--iso-preparer kanotix.com \
@@ -33,7 +36,6 @@ lb config noauto \
 	--mirror-binary ${MIRROR_BINARY} \
 	--mirror-binary-security ${MIRROR_BINARY_SECURITY} \
 	--binary-indices true \
-	--packages-lists "standard-x11" \
 	${@}
 
 # hostname and username are configured in config/chroot_local-includes/etc/live/config.conf
diff --git a/auto/kanotix b/auto/kanotix
index c61e9cf..c99757b 100755
--- a/auto/kanotix
+++ b/auto/kanotix
@@ -7,7 +7,6 @@ usage()
 cat <<eof
 
 Additional Options for Kanotix:
-            [--kanotix-flavours FLAVOUR|"FLAVOURS"]
 	    [--include-nvidia true|false]
 	    [--tmpfs true|false]
 	    [--tmpfs-options OPTIONS]
@@ -17,7 +16,6 @@ eof
 
 write_kanotix_config()
 {
-[ -z "${LB_KANOTIX_FLAVOURS}" ] && LB_KANOTIX_FLAVOURS="kanotix-master"
 [ -z "${LB_KANOTIX_NVIDIA}" ] && LB_KANOTIX_NVIDIA="true"
 [ -z "${LB_KANOTIX_TMPFS}" ] && [ -d tmpfs ] && LB_KANOTIX_TMPFS="true"
 [ -z "${LB_KANOTIX_TMPFS}" ] && LB_KANOTIX_TMPFS="false"
@@ -26,10 +24,6 @@ write_kanotix_config()
 cat >config/kanotix << EOF
 # config/kanotix - additional options for Kanotix
 
-# \$LB_KANOTIX_FLAVOURS: select Kanotix-packageslists
-# (Default: kanotix-master)
-LB_KANOTIX_FLAVOURS="${LB_KANOTIX_FLAVOURS}"
-
 # \$LB_KANOTIX_NVIDIA: include NVidia-Drivers into chroot
 # (Default: ${LB_KANOTIX_NVIDIA})
 LB_KANOTIX_NVIDIA="${LB_KANOTIX_NVIDIA}"
@@ -51,15 +45,6 @@ unset args; i=1
 while [ "$1" ]
 do
         case "$1" in
-        --kanotix-flavour*)
-                LB_KANOTIX_FLAVOURS="$2"
-                shift
-                while [ "$2" -a "${2:0:1}" != "-" ]
-                do
-                        LB_KANOTIX_FLAVOURS="$LB_KANOTIX_FLAVOURS $2"
-                        shift
-                done
-                ;;
 	--include-nvidia)
 		LB_KANOTIX_NVIDIA="$2"
 		shift