From 5d8332af77acdb5acb2db7a9f8da0c402f6f8457 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Fri, 24 Mar 2017 14:05:12 +0100
Subject: [PATCH] use an array for custdebs

---
 config        | 1 +
 zlibs/helpers | 6 ++++--
 zlibs/iso     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config b/config
index 27be55b..a6c722c 100644
--- a/config
+++ b/config
@@ -21,6 +21,7 @@
 
 vars+=(release version mirror section blend_name image_name vm_name)
 vars+=(arch earch)
+vars+=(usercredentials rootcredentials)
 
 arrs+=(core_packages base_packages purge_packages blend_packages)
 
diff --git a/zlibs/helpers b/zlibs/helpers
index 4815a1b..aa614b6 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -229,7 +229,7 @@ EOF
 
 install-custdebs() {
 	fn install-custdebs
-	req=(R strapdir)
+	req=(R strapdir custom_deb_packages)
 	ckreq || return 1
 
 	sudo mkdir -p $strapdir/debs
@@ -237,10 +237,12 @@ install-custdebs() {
 
 	cat <<EOF | sudo tee ${strapdir}/install-debs >/dev/null
 #!/bin/sh
-for deb in /debs/*.deb; do
+cd /debs
+for deb in ${custom_deb_packages}; do
 	dpkg -i \$deb
 	apt-get --yes --force-yes -f install
 done
+cd /
 apt-get autoremove
 apt-get clean
 rm -rf /debs
diff --git a/zlibs/iso b/zlibs/iso
index 92f4601..2cd3bdb 100644
--- a/zlibs/iso
+++ b/zlibs/iso
@@ -90,7 +90,7 @@ iso_squash_strap() {
 
 	pushd $workdir
 	sudo mksquashfs $strapdir binary/live/filesystem.squashfs \
-		-comp xz -e boot || zerr
+		-noappend -comp xz || zerr
 	popd
 }