Do not install dhcp client

README.md

@@ -3,7 +3,7 @@
 Devuan Linux for Windows users  
 <a href="//git.lumen.sh/Fierelier/windvn/raw/branch/master/assets/screenshot.png" target="_blank"><img src="assets/screenshot.png" width="360" title="Screenshot"></a>
 
-# [Download](https://fier.me/software/windvn/iso/chimaera)
+# [Download](https://fier.me/software/windvn/iso/daedalus)
 
 Regular ISOs have a full live environment. The desktop environment can be started by going into bash, and typing `startx`. Legacy ISOs only have a text live environment.
 

modlists/hardware-proprietary

@@ -1,3 +1,4 @@
 sources-proprietary
+firmware-proprietary-prereq
 firmware-proprietary-licenses
 firmware-proprietary

mods/firmware-proprietary-licenses/data/chroot

@@ -5,4 +5,4 @@ EOF
 
 cat << EOF | debconf-set-selections
 firmware-ivtv firmware-ivtv/license/accepted boolean true
-EOF
+EOF

mods/firmware-proprietary-prereq/data/chroot

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+apt-get -y install python3-apt

mods/firmware-proprietary/data/chroot

@@ -1,13 +1,12 @@
-#!/bin/bash
-set -e
-function sfp {
-	packages=""
-	while read p; do
-		IFS=" " read -ra packageinfo <<< "$p"
-		if [[ "${packageinfo[0]}" == *firmware* ]]; then
-			packages="$packages ${packageinfo[0]}"
-		fi
-	done <<<$(apt-cache search "$1")
-	echo "$packages"
-}
-echo "WDVN_PACKAGES=\"\$WDVN_PACKAGES firmware-linux firmware-misc-nonfree amd64-microcode intel-microcode $(sfp wireless) $(sfp wifi) $(sfp net) $(sfp nic)\"" >"/chroot-out"
+#!/usr/bin/env python3
+import apt
+cache = apt.Cache()
+ofile = open("/chroot-out","w",encoding="utf-8")
+ofile.write('WDVN_PACKAGES="$WDVN_PACKAGES')
+for package in cache:
+	if "nvidia" in package.name.lower(): continue
+	if package.name == "raspi-firmware": continue
+	if package.candidate.origins[0].component == "non-free-firmware":
+		ofile.write(" " + package.name)
+ofile.write('"')
+ofile.close()

mods/sources-proprietary/modscript

@@ -1,12 +1,12 @@
 #!/bin/bash
-echo "deb $WDVN_URL $WDVN_VER main contrib non-free
-# deb-src $WDVN_URL $WDVN_VER main contrib non-free
+echo "deb $WDVN_URL $WDVN_VER main contrib non-free non-free-firmware
+# deb-src $WDVN_URL $WDVN_VER main contrib non-free non-free-firmware
 
-deb $WDVN_URL $WDVN_VER-security main contrib non-free
-# deb-src $WDVN_URL $WDVN_VER-security main contrib non-free
+deb $WDVN_URL $WDVN_VER-security main contrib non-free non-free-firmware
+# deb-src $WDVN_URL $WDVN_VER-security main contrib non-free non-free-firmware
 
 # $WDVN_VER-updates, to get updates before a point release is made;
 # see https://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_updates>
-# deb $WDVN_URL $WDVN_VER-updates main contrib non-free
-# deb-src $WDVN_URL $WDVN_VER-updates main contrib non-free
+# deb $WDVN_URL $WDVN_VER-updates main contrib non-free non-free-firmware
+# deb-src $WDVN_URL $WDVN_VER-updates main contrib non-free non-free-firmware
 " >"$1/etc/apt/sources.list"

shell

@@ -1,7 +1,7 @@
 #!/bin/bash
 export WDVN_NAME="windvn"
 export WDVN_URL="http://deb.devuan.org/merged"
-export WDVN_VER_DEBSTRAP="chimaera" # This is the suite/version name passed to debootstrap. This is useful if you want to pull, for example, daedalus, but that name is not understood yet in debootstrap. So you can use "testing" instead, which is always understood, and then put "daedalus" (or whatever currently corresponds to testing) into WDVN_VER, so the resulting distro stays within the daedalus specification, instead of updating to the next testing version.
+export WDVN_VER_DEBSTRAP="daedalus" # This is the suite/version name passed to debootstrap. This is useful if you want to pull, for example, daedalus, but that name is not understood yet in debootstrap. So you can use "testing" instead, which is always understood, and then put "daedalus" (or whatever currently corresponds to testing) into WDVN_VER, so the resulting distro stays within the daedalus specification, instead of updating to the next testing version.
 export WDVN_VER="$WDVN_VER_DEBSTRAP"
 
 export WDVN_DATE="$(date --utc "+%Y.%m.%d-%H.%M.%S")"