From 09d0b7b3bd16c403f614028f17832e6d88116dd7 Mon Sep 17 00:00:00 2001
From: Tom Hocker <tom@humandecoded.io>
Date: Fri, 17 Feb 2023 14:23:18 -0500
Subject: [PATCH 1/2] updated build to match OffSec

---
 tlosint.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tlosint.yaml b/tlosint.yaml
index d1b972a..4e9382c 100644
--- a/tlosint.yaml
+++ b/tlosint.yaml
@@ -27,6 +27,10 @@ actions:
     components: [ main, contrib, non-free ]
     keyring-file: kali-archive-keyring.gpg
 
+  - description: "Install usr-is-merged (cf. debos #361 and #362)"
+    action: apt
+    packages: [ usr-is-merged ]
+
   - description: "Preseed package configuration"
     action: run
     chroot: true

From eb638222891a9fa0b88b416c53638a944a9a8c09 Mon Sep 17 00:00:00 2001
From: Tom Hocker <tom@humandecoded.io>
Date: Sat, 18 Feb 2023 00:21:00 -0500
Subject: [PATCH 2/2] added option to not compress

---
 build-vbox.sh   | 2 +-
 build-vmware.sh | 2 +-
 build.sh        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 build-vbox.sh
 mode change 100644 => 100755 build-vmware.sh
 mode change 100644 => 100755 build.sh

diff --git a/build-vbox.sh b/build-vbox.sh
old mode 100644
new mode 100755
index 038ae27..326a192
--- a/build-vbox.sh
+++ b/build-vbox.sh
@@ -191,7 +191,7 @@ while getopts ":a:b:D:o:f:hkL:m:P:r:s:S:T:U:v:x:z" opt; do
         (U) USERPASS=$OPTARG ;;
         (v) VARIANT=$OPTARG ;;
         (x) VERSION=$OPTARG ;;
-        (z) ZIP=true ;;
+        (z) ZIP=false ;;
         (*) echo "$USAGE" >&2; exit 1 ;;
     esac
 done
diff --git a/build-vmware.sh b/build-vmware.sh
old mode 100644
new mode 100755
index 3c4a8b0..53a4cba
--- a/build-vmware.sh
+++ b/build-vmware.sh
@@ -191,7 +191,7 @@ while getopts ":a:b:D:o:f:hkL:m:P:r:s:S:T:U:v:x:z" opt; do
         (U) USERPASS=$OPTARG ;;
         (v) VARIANT=$OPTARG ;;
         (x) VERSION=$OPTARG ;;
-        (z) ZIP=true ;;
+        (z) ZIP=false ;;
         (*) echo "$USAGE" >&2; exit 1 ;;
     esac
 done
diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
index 3c4a8b0..53a4cba
--- a/build.sh
+++ b/build.sh
@@ -191,7 +191,7 @@ while getopts ":a:b:D:o:f:hkL:m:P:r:s:S:T:U:v:x:z" opt; do
         (U) USERPASS=$OPTARG ;;
         (v) VARIANT=$OPTARG ;;
         (x) VERSION=$OPTARG ;;
-        (z) ZIP=true ;;
+        (z) ZIP=false ;;
         (*) echo "$USAGE" >&2; exit 1 ;;
     esac
 done