use an array for custdebs

This commit is contained in:
parazyd 2017-03-24 14:05:12 +01:00
parent b7da12b9b4
commit 5d8332af77
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
3 changed files with 6 additions and 3 deletions

1
config
View File

@ -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)

View File

@ -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

View File

@ -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
}