From 0679a761cbeb9eed238a6d6ed81186d344be1192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Thu, 1 Sep 2022 12:23:09 +0200 Subject: [PATCH] Revert "Work-around non-co-installability of nvidia-tesla-kernel-support and nvidia-tesla-470-kernel-support" This reverts commit 8bd6060b07cd7d1cb03220d6ed5b44cbec0db6bc. Actually --firmware-binary is also affected by the same issue and there I'd rather not remove the logic to include the firmwares in the installer. So instead I went for a temporary solution where I excluded nvidia-graphics-drivers-tesla-470 from Kali entirely. --- auto/config | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/auto/config b/auto/config index 6c56ca3..bcc5ac9 100755 --- a/auto/config +++ b/auto/config @@ -123,10 +123,6 @@ if [ -n "$enable_pu" ]; then > config/archives/kali-proposed-updates.list.binary fi -# XXX: --firmware-chroot has been set to false to work around -# https://bugs.debian.org/1018873 and we deemed that acceptable because -# kali-linux-headless already pulls kali-linux-firmware so most firmwares -# will continue to be installed lb config noauto \ --apt-indices=false \ --distribution "$dist" \ @@ -138,7 +134,7 @@ lb config noauto \ --backports false \ --source false \ --firmware-binary true \ - --firmware-chroot false \ + --firmware-chroot true \ --mirror-bootstrap "$kali_mirror" \ --mirror-debian-installer "$kali_mirror" \ --mirror-binary "$public_kali_mirror" \