With this version, arm firmware are excluded from x86 isos, and the
other way round. In practice, it means that raspi-firmware won't be
installed on amd64 isos, and that's something we need.
No need to explicitly list kali-themes in the packages to install, it's
pulled in anyway via the following dependency chain: kali-desktop-i3 ->
kali-desktop-core -> kali-themes
I removed the pulseaudio hook. I really don't see a reason to start
pulseaudio once, during the build process, as root. Plus, the second
line of the hook (rm -rf .pulse-cookieaa) has no effect, since there's
no file named .pulse-cookieaa. I added some debug logs to the hook to
confirm that.
These packages were added at a time when debian-cd didn't resolve
Recommends to the end, so we needed to list it explicitly there. But
it's been fixed now, in debian-cd 3.1.36 (cf. #601203), so we can drop
those lines.
usr-is-merged is included in simple-cdd offline.downloads's since
version 0.6.9. Not sure why I needed to list it in installer-netinst as
well at the time, but after testing, I can confirm it's not needed
anymore.
This reverts commit 7bb52e4991.
I wanted to make sure firmware are included in the installer image, but
I missed it, I modified a config file that is only for live images, it
seems...
Also, note that the previous commit message
Kali purple: install kali-system-gui (instead of core)
Should have been:
Kali purple: include kali-system-gui (instead of core) in the installer
Because this commit is really about having the package available in the
installer, but it doesn't "install it" on the system. Sorry for the
confusion.
The dep chain is kali-system-gui > kali-system-cli > kali-system-core.
kali-system-cli contains wget and curl, which we probably want to have,
and will fix https://gitlab.com/kalilinux/kali-purple/documentation/-/issues/9
I'm not sure about kali-system-gui, but I have the impression that it
was the intention to install it in Kali Purple, but at some point it was
forgotten and we install kali-system-core instead.
The package exploitdb-papers was removed from kali-tools-identify in
src:kali-meta 2023.1.11, so there's no need to exclude it here anymore.
As a consequence, no need for the network during installation anymore.
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.
Other things that I tried, but that didn't work, below:
I tried adding the preseed to simple-cdd/profiles/kali-purple.preseed,
however that didn't work, I guess that this preseed file is loaded only
later during installation, and that at this point the GUI was already
loaded and it's too late to set the theme.
I also tried to do this in simple-cdd.conf:
# Theming
if echo " $profiles " | grep -q " kali-purple "; then
export KERNEL_PARAMS="${KERNEL_PARAMS} debian-installer/theme=Clearlooks-Purple "
fi
But it doesn't work, seemingly 'profiles' is not set when simple-cdd
loads the conf, and even though we build with the command:
build-simple-cdd [...] --profiles "$profiles" [...]
Given the fact that uppercase variables are exported, and what we
actually want to change is KERNEL_PARAMS, it seems that the most
straightforward is just to preset it from build.sh.
This profile does the following:
- it enables the elastic apt repo
- it also enables the network during installation
- finally, it makes sure to exclude the very big package
exploitdb-papers, otherwise the iso is too big (~ 6 GB)
I'm a bit surprised that we need to enable the network via a preseed
file. I thought that it would be enough to just make sure that the
installer-purple variant does NOT include the offline profile, but in
practice no, it's not enough.
build.sh:
Note that the installer-purple variant does NOT include the offline
profile, that's on purpose. There's no requirement for this installer to
work offline, and on top of that, we can't include all the packages in
the iso at the moment (the package exploitdb-papers is too big). So we
very much expect to have network, and to download big packages during
the installation.
See next commits for more details.
kali-config/installer-purple/packages:
Unlike other variants, the "base" metapackage is kali-system-core,
which is a very stripped down metapackage with no offensive tools.
(kali-system-core is basically what used to be kali-linux-core, minus
the few offensive tools that were in there).
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.
Arszilla
Arnaud Rebillout
g0t mi1k
Ben Wilson
Daniel Ruiz de Alegría
Raphaël Hertzog