Fix installer image to cope with default 686-pae kernel that we use on i386

Debian defaults to linux-image-686 for i386 on all levels (simple-cdd,
debian-cd, debian-installer). Kali modified debian-installer to use
linux-image-686-pae in debian-installer (for the benefit of the live
image mainly!). We have to adjust simple-cdd (by way of the
kernel_packages configuration item) and debian-cd (with some live
patching of a copy).

.gitignore

@@ -14,5 +14,6 @@ config/binary
 config/bootstrap
 config/common
 config/source
+simple-cdd/debian-cd
 simple-cdd/profiles/kali.downloads
 simple-cdd/tmp

build.sh

@@ -219,9 +219,18 @@ case "$IMAGE_TYPE" in
 	installer)
 		if [ "$NO_CLEAN" = "" ]; then
 			run_and_log $SUDO rm -rf simple-cdd/tmp
+			run_and_log $SUDO rm -rf simple-cdd/debian-cd
 		fi
 
+		# Setup custom debian-cd to make our changes
+		cp -aT /usr/share/debian-cd simple-cdd/debian-cd
+		# Keep 686-pae udebs as we changed the default from 686
+		# to 686-pae in the debian-installer images
+		sed -i -e '/686-pae/d' \
+		    simple-cdd/debian-cd/data/$CODENAME/exclude-udebs-i386
+
 		# Override some debian-cd environment variables
+		export BASEDIR=$(pwd)/simple-cdd/debian-cd
 		export ARCHES=$KALI_ARCH
 		export ARCH=$KALI_ARCH
 		export DEBVERSION=$KALI_VERSION

simple-cdd/simple-cdd.conf

@@ -51,6 +51,11 @@ mirror_components="main contrib non-free"
 security_mirror=""
 updates_mirror=""
 
+# Kernel related
+if [ "$ARCH" = "i386" ]; then
+    kernel_packages="linux-image-686-pae"
+fi
+
 # Random other variables
 export default_desktop="xfce"
 export DISKINFO_DISTRO="Kali"
@@ -91,7 +96,7 @@ export DISC_END_HOOK=$(pwd)/disc-end-hook
 #export http_proxy=http://localhost:3128
 
 # Location of debian-cd files
-#debian_cd_dir=/path/to/debian-cd
+debian_cd_dir=${BASEDIR:-/usr/share/debian-cd}
 
 # Set target architecture for build
 #export ARCH=amd64