Enable non-free-firmware by default everywhere

Even though it's currently empty, we want users to have this component
enabled so that they don't miss on updates when we start to move
packages from non-free to non-free-firmware.

auto/config

@@ -117,9 +117,9 @@ cp -rT kali-config/common config
 
 if [ -n "$enable_pu" ]; then
 	mkdir -p config/archives
-	echo "deb $kali_mirror $dist-proposed-updates main contrib non-free" \
+	echo "deb $kali_mirror $dist-proposed-updates main contrib non-free non-free-firmware" \
 		> config/archives/kali-proposed-updates.list.chroot
-	echo "deb $public_kali_mirror $dist-proposed-updates main contrib non-free" \
+	echo "deb $public_kali_mirror $dist-proposed-updates main contrib non-free non-free-firmware" \
 		> config/archives/kali-proposed-updates.list.binary
 fi
 
@@ -127,7 +127,7 @@ lb config noauto \
 	--apt-indices=false \
 	--distribution "$dist" \
 	--debian-installer-distribution "$dist" \
-	--archive-areas "main contrib non-free" \
+	--archive-areas "main contrib non-free non-free-firmware" \
 	--debootstrap-options "--keyring=/usr/share/keyrings/kali-archive-keyring.gpg" \
 	--keyring-packages kali-archive-keyring \
 	--updates false \

kali-config/common/includes.installer/kali-finish-install

@@ -17,10 +17,10 @@ configure_sources_list() {
 
     cat >/etc/apt/sources.list <<END
 # See https://www.kali.org/docs/general-use/kali-linux-sources-list-repositories/
-deb http://http.kali.org/kali kali-rolling main contrib non-free
+deb http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware
 
 # Additional line for source packages
-# deb-src http://http.kali.org/kali kali-rolling main contrib non-free
+# deb-src http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware
 END
     apt-get update
 }

kali-config/common/includes.installer/preseed.cfg

@@ -15,6 +15,7 @@ d-i apt-setup/services-select multiselect
 
 # Enable contrib and non-free
 d-i apt-setup/non-free boolean true
+d-i apt-setup/non-free-firmware boolean true
 d-i apt-setup/contrib boolean true
 
 # Disable CDROM entries after install

simple-cdd/simple-cdd.conf

@@ -43,7 +43,7 @@ debian_mirror=${debian_mirror:-http://archive.kali.org/kali/}
 keyring="/usr/share/keyrings/kali-archive-keyring.gpg"
 
 # which components to get from the mirror
-mirror_components="main contrib non-free"
+mirror_components="main contrib non-free non-free-firmware"
 
 # Disable *-security and *-updates repositories
 security_mirror=""
@@ -78,7 +78,7 @@ export OMIT_DOC_TOOLS=1
 export DOJIGDO=0
 export NORECOMMENDS=0
 export NONFREE=1
-export NONFREE_COMPONENTS="non-free"
+export NONFREE_COMPONENTS="non-free non-free-firmware"
 export CONTRIB=1
 export FORCE_FIRMWARE=1
 export ARCHIVE_KEYRING_PACKAGE=kali-archive-keyring