From 20b8a42a23bf62a6f0be4f206f33aa45864c1be7 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Fri, 13 Nov 2020 14:13:11 +0100
Subject: [PATCH] Port devuan-desktop-live.

---
 blends/devuan-desktop-live/config             |  4 +-
 .../devuan-desktop-live.blend                 | 39 ++++++++++++-------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/blends/devuan-desktop-live/config b/blends/devuan-desktop-live/config
index ded6569..f6f9eef 100644
--- a/blends/devuan-desktop-live/config
+++ b/blends/devuan-desktop-live/config
@@ -17,7 +17,7 @@ default_shell="/bin/bash"
 #hookscripts="yes"
 
 # uncomment to create uefi-bootable iso
-mkefi="yes"
+MKEFI=1
 efi_work="$BLENDPATH/${release}/efi-files"
 
 #grubversion="grub-pc"
@@ -44,5 +44,3 @@ source $release_conf
 ## image_name depends on release and version
 
 image_name="${os}_${release}_${version}_${arch}_desktop"
-
-
diff --git a/blends/devuan-desktop-live/devuan-desktop-live.blend b/blends/devuan-desktop-live/devuan-desktop-live.blend
index a681c6f..0812253 100644
--- a/blends/devuan-desktop-live/devuan-desktop-live.blend
+++ b/blends/devuan-desktop-live/devuan-desktop-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"
 
 blend_preinst() {
 	fn blend_preinst
@@ -32,12 +32,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; }
 
-	if [[ -e "${blend_release_path}/custom_debs/*.deb" ]] ; then
-		notice "copying blend-specific debs"
-		cp -fv "$blend_release_path"/custom_debs/*.deb "$R/extra/custom-packages"
-	fi
+    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() {
@@ -47,15 +61,14 @@ blend_postinst() {
 
 	notice "executing $blend_name postinst"
 
-	[[ $mkefi = yes ]] && {
+	[[ -n "$MKEFI" ]] && {
 		iso_make_efi
 		iso_write_grub_cfg
 	}
 
-	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; }
+
 		# add some basic files to /dev
 sudo mknod -m 622 dev/console c 5 1
 sudo mknod -m 666 dev/null c 1 3
@@ -79,7 +92,7 @@ sudo chmod 1777 dev/shm
 	blend_finalize || zerr
 }
 
-# Set lvm not to use udev in initramfs to avoid boot delays. 
+# Set lvm not to use udev in initramfs to avoid boot delays.
 # (e.g. "device not in udev database even after waiting...")
 edit_initramfs () {
 	fn edit_initramfs