From d45fa9a62937a5a2ecaff65d9bc58e77db83cdb9 Mon Sep 17 00:00:00 2001
From: cyteen <cyteen@ring-zero.co.uk>
Date: Sat, 11 May 2024 17:00:08 +0100
Subject: [PATCH] Add case for resolv.conf and buster sources.

buster sources.list naming is different from other releases.

without systemd we use connman and provide a link to resolv.conf
---
 scripts/build-debian | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/scripts/build-debian b/scripts/build-debian
index ba0009d..94dace8 100755
--- a/scripts/build-debian
+++ b/scripts/build-debian
@@ -98,7 +98,7 @@ devuan)
 		--verbose \
 		--variant=minbase \
 		--foreign \
-		--include=netbase,net-tools,sysvinit,u-boot-tools,initramfs-tools,openssh-server,vim-tiny \
+		--include=netbase,net-tools,sysvinit,u-boot-tools,initramfs-tools,openssh-server,nano,vim-tiny \
 		"${TARGET}" \
 		debian \
 		"${URL}" \
@@ -147,7 +147,7 @@ debian-*)
 		deb-src http://security.debian.org/debian-security ${DIST}-security main
 	EOF
 	;;
-devuan-*-ceres | devuan-*-unstable | devuan-*-experimental)
+devuan-*-ceres | devuan-*-unstable)
 	# https://pkginfo.devuan.org/sources.list.txt
 	tee debian/tmp/sources.list <<-EOF
 		deb http://deb.devuan.org/merged ${DIST} main
@@ -164,6 +164,16 @@ devuan-*)
 		deb-src http://deb.devuan.org/merged ${DIST}-security main
 	EOF
 	;;
+devuan-*-buster)
+	tee debian/tmp/sources.list <<-EOF
+		deb http://deb.devuan.org/merged ${DIST} main
+		deb-src http://deb.devuan.org/merged ${DIST} main
+		deb http://deb.devuan.org/merged ${DIST}-updates main
+		deb-src http://deb.devuan.org/merged ${DIST}-updates main
+		deb http://deb.devuan.org/merged ${DIST} main
+		deb-src http://deb.devuan.org/merged ${DIST} main
+	EOF
+	;;
 ubuntu-amd64-*)
 	tee debian/tmp/sources.list <<-EOF
 		deb http://archive.ubuntu.com/ubuntu ${DIST} main universe
@@ -257,16 +267,15 @@ cp -rv --preserve=mode ../2nd-stage-files/post-2nd-stage-files/* debian
 echo "${OS}" >debian/etc/hostname
 
 # Set resolv.conf
-case "${OS}" in:
-  debian | ubuntu)
-    ln -sf /run/systemd/resolve/stub-resolv.conf debian/etc/resolv.conf
-    ;;
-  devuan)
-    ln -sf /run/connman/resolv.conf debian/etc/resolv.conf
-    ;;
-    *)
-    ;;
-esac  
+case "${OS}" in
+debian | ubuntu)
+	ln -sf /run/systemd/resolve/stub-resolv.conf debian/etc/resolv.conf
+	;;
+devuan)
+	ln -sf /run/connman/resolv.conf debian/etc/resolv.conf
+	;;
+*) ;;
+esac
 
 # List all files
 find debian ! -type d -printf "/%P\n" | sort >files.txt