From a1c636e7a6b9fd78ed7b28577558fb8df8ddede2 Mon Sep 17 00:00:00 2001
From: Arnaud Rebillout <arnaudr@kali.org>
Date: Tue, 4 Apr 2023 14:53:52 +0700
Subject: [PATCH] Drop usr-is-merged from offline.downloads and
 installer-netinst

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.
---
 kali-config/installer-netinst/packages | 2 --
 simple-cdd/profiles/offline.downloads  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kali-config/installer-netinst/packages b/kali-config/installer-netinst/packages
index 19cdd56..a5e61d1 100644
--- a/kali-config/installer-netinst/packages
+++ b/kali-config/installer-netinst/packages
@@ -7,5 +7,3 @@
 # We still put kali-linux-firmware because we want firmware to be
 # in the ISO for use by the installer
 kali-linux-firmware
-# Add packages required by debootstrap (cf. #51)
-usr-is-merged
diff --git a/simple-cdd/profiles/offline.downloads b/simple-cdd/profiles/offline.downloads
index 6b01884..0caad6b 100644
--- a/simple-cdd/profiles/offline.downloads
+++ b/simple-cdd/profiles/offline.downloads
@@ -1,5 +1,3 @@
-# Add packages required by debootstrap (cf. #51)
-usr-is-merged
 # Add packages required for virtualization support (installed by
 # /usr/lib/finish-install.d/08hw-detect) including their recommends
 hyperv-daemons