From ee4d243ac562bc951f21be9c5a9124d89ae356b3 Mon Sep 17 00:00:00 2001
From: Arnaud Rebillout <arnaudr@kali.org>
Date: Fri, 10 Feb 2023 18:59:31 +0700
Subject: [PATCH] Set simple-cdd profiles from build.sh (instead of guessing
 from config)

With this change, we do NOT set profiles based on DISKTYPE anymore.
Instead, we set profiles (and auto_profiles) in build.sh, depending on
the variant.

This change is in preparation for next commit, where we'll introduce a
new installer variant.
---
 build.sh                   | 12 ++++++++++--
 simple-cdd/simple-cdd.conf | 14 ++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/build.sh b/build.sh
index 774c866..f4e7071 100755
--- a/build.sh
+++ b/build.sh
@@ -323,10 +323,16 @@ case "$IMAGE_TYPE" in
 
 		if [ "$KALI_VARIANT" = "netinst" ]; then
 			export DISKTYPE="NETINST"
-		else
+			profiles="kali"
+			auto_profiles="kali"
+		else    # plain installer
 			export DISKTYPE="BD"
+			profiles="kali offline"
+			auto_profiles="kali offline"
 		fi
 		debug "DISKTYPE: $DISKTYPE"
+		debug "profiles: $profiles"
+		debug "auto_profiles: $auto_profiles"
 
 		if [ -e .mirror ]; then
 			kali_mirror=$(cat .mirror)
@@ -379,7 +385,9 @@ case "$IMAGE_TYPE" in
 			--force-root \
 			--conf simple-cdd.conf \
 			--dist $CODENAME \
-			--debian-mirror $kali_mirror
+			--debian-mirror $kali_mirror \
+			--profiles "$profiles" \
+			--auto-profiles "$auto_profiles"
 		res=$?
 		cd ../
 		if [ $res -ne 0 ] || [ ! -e $IMAGE_NAME ]; then
diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf
index 39b5a0b..e7be992 100644
--- a/simple-cdd/simple-cdd.conf
+++ b/simple-cdd/simple-cdd.conf
@@ -23,20 +23,10 @@
 # options to determine which profiles you want to install.
 
 # Profiles to include on the CD
-#profiles=""
-#profiles="x-basic ltsp"
+profiles=${profiles:-kali}
 
 # To automatically select profiles (must also be listed in profiles):
-# auto_profiles="foo bar baz"
-
-if [ "$DISKTYPE" = "NETINST" ]; then
-    profiles="kali"
-    auto_profiles="kali"
-else
-    # Enable offline installation for full installer image
-    profiles="kali offline"
-    auto_profiles="kali offline"
-fi
+auto_profiles=${auto_profiles:-kali}
 
 # To include profiles which only effect the CD build
 # build_profiles="kali"