From 0f2299d1bb79e326467bf3fc07f3600c7a26d630 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Fri, 13 Nov 2020 14:10:28 +0100
Subject: [PATCH] Port devuan-minimal-live.blend.

---
 blends/devuan-minimal-live/config             | 14 ++-----
 .../devuan-minimal-live.blend                 | 37 +++++++++++++------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/blends/devuan-minimal-live/config b/blends/devuan-minimal-live/config
index 2d46235..9cccb3e 100644
--- a/blends/devuan-minimal-live/config
+++ b/blends/devuan-minimal-live/config
@@ -7,7 +7,8 @@ arrs+=(custom_deb_packages)
 blend_name="devuan-minimal-live"
 
 release="beowulf"
-
+mirror="http://pkgmaster.devuan.org/merged"
+section="main contrib non-free"
 
 username="devuan"
 userpass="devuan"
@@ -17,24 +18,17 @@ default_shell="/bin/bash"
 #hookscripts="yes"
 
 # uncomment to create uefi-bootable iso
-#mkefi="yes"
+#MKEFI=1
 #efi_work="$BLENDPATH/efi-files"
 
 #grubversion="grub-pc"
 #grubversion="grub-efi-amd64"
 
-##release="ascii"
-mirror="http://pkgmaster.devuan.org/merged"
-section="main contrib non-free"
-
-
 base_packages_option=(--no-install-recommends)
 extra_packages_option=(--no-install-recommends)
 
-
 release_conf="$BLENDPATH/$release/config"
 
-
 ### package sets are defined in the corresponding $release/config file
 
 source $release_conf
@@ -42,5 +36,3 @@ source $release_conf
 ## image_name depends on release and version
 
 image_name="${os}_${release}_${version}_${arch}_minimal"
-
-
diff --git a/blends/devuan-minimal-live/devuan-minimal-live.blend b/blends/devuan-minimal-live/devuan-minimal-live.blend
index 0a8d8f5..5dba611 100644
--- a/blends/devuan-minimal-live/devuan-minimal-live.blend
+++ b/blends/devuan-minimal-live/devuan-minimal-live.blend
@@ -20,10 +20,10 @@
 
 BLENDPATH="${BLENDPATH:-$(dirname $0)}"
 
-source $BLENDPATH/config
+source "$BLENDPATH/config"
 
-blend_release_path=$BLENDPATH/$release/
-blend_scripts=${blend_release_path}/scripts
+blend_release_path="$BLENDPATH/$release/"
+blend_scripts="${blend_release_path}/scripts"
 
 ###source $BLENDPATH/$release/devuan-minimal-live.release
 
@@ -34,11 +34,26 @@ blend_preinst() {
 
 	notice "executing $blend_name preinst"
 
-	add-user $username $userpass
+    cat <<EOF | sudo tee "$strapdir/add-user" >/dev/null
+#!/bin/sh
+useradd -s /bin/bash -m "${username}" || exit 1
+echo "${username}:${userpass} | chpasswd || exit 1
+EOF
+    chroot-script -d add-user || { zerr; return 1; }
 
-	notice "copying blend-specific debs into $R/extra/custom-packages"
-	## No more custom-packages
-	cp -fv "$blend_release_path"/custom_debs/*.deb "$R/extra/custom-packages"
+    notice "copying blend-specific debs into $R/extra/custom-packages"
+
+    sudo mkdir -p "$strapdir/extra_packages" || { zerr; return 1; }
+    sudo cp -fv "$blend_release_path"/custom_debs/*.deb "$strapdir/extra_packages" || { zerr; return 1; }
+    cat << EOF
+#!/bin/sh
+cd custom-packages
+dpkg -i *_all.deb *_${arch}.deb
+apt-get -f install
+cd - >/dev/null
+rm -rf custom-packages
+EOF
+    chroot-script -d install-custpackages || { zerr; return 1; }
 }
 
 blend_postinst() {
@@ -48,19 +63,17 @@ blend_postinst() {
 
 	notice "executing $blend_name postinst"
 
-#	[[ "$mkefi" = "yes" ]] && {
+#	[[ -n "$MKEFI" ]] && {
 #		iso_make_efi
 #		iso_write_grub_cfg
 #	}
 
-	## TODO: ENABLE THIS
-	install-custdebs || zerr
 	pushd "$strapdir"
-		sudo rsync -avx --no-o --no-g "$blend_release_path"/rootfs_overlay/* . || zerr
+		sudo rsync -avx --no-o --no-g "$blend_release_path"/rootfs_overlay/* . || { zerr; return 1; }
 		sudo chmod 755 etc/init.d/boot_beep
 	popd
 
-	blend_finalize || zerr
+	blend_finalize || { zerr; return 1 }
 }
 
 iso_write_isolinux_cfg() {