Merge pull request #1 from tracelabs/dev-tom

updated build to match OffSec
tracelabs · Feb 18, 2023 · 3395612 · 3395612
2 parents 261ebb2 + eb63822
commit 3395612
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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/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