From 7e6436a13c32e81dbf6bf159d3ecaa34945b441e Mon Sep 17 00:00:00 2001
From: KatolaZ <katolaz@freaknet.org>
Date: Wed, 6 Jun 2018 14:44:53 +0100
Subject: [PATCH] ASCII 2.0 stable

---
 blends/devuan-minimal-live/ascii/config                  | 4 +---
 blends/devuan-minimal-live/ascii/rootfs_overlay/etc/motd | 2 +-
 .../ascii/rootfs_overlay/root/remove_firmware.sh         | 5 -----
 blends/devuan-minimal-live/devuan-minimal-live.blend     | 9 +++++++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/blends/devuan-minimal-live/ascii/config b/blends/devuan-minimal-live/ascii/config
index 847b004..945238d 100644
--- a/blends/devuan-minimal-live/ascii/config
+++ b/blends/devuan-minimal-live/ascii/config
@@ -31,6 +31,7 @@ minimal_base_packages+=(
 	dselect
 	file
 	groff-base
+	grub-pc
 	info
 	kbd
 	laptop-detect
@@ -236,13 +237,10 @@ base_packages+=(
 
 extra_packages+=(
 	atmel-firmware
-	b43-fwcutter
 	bluez-firmware
 	dahdi-firmware-nonfree
 	firmware-amd-graphics
 	firmware-atheros
-	firmware-b43-installer
-	firmware-b43legacy-installer
 	firmware-bnx2
 	firmware-bnx2x
 	firmware-brcm80211
diff --git a/blends/devuan-minimal-live/ascii/rootfs_overlay/etc/motd b/blends/devuan-minimal-live/ascii/rootfs_overlay/etc/motd
index 20280cf..77fb67c 100644
--- a/blends/devuan-minimal-live/ascii/rootfs_overlay/etc/motd
+++ b/blends/devuan-minimal-live/ascii/rootfs_overlay/etc/motd
@@ -1,5 +1,5 @@
 
-Devuan ASCII 2.0.0-beta -- Minimal Live 
+Devuan ASCII 2.0.0 -- Minimal Live 
 
 Devuan GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent
 permitted by applicable law. 
diff --git a/blends/devuan-minimal-live/ascii/rootfs_overlay/root/remove_firmware.sh b/blends/devuan-minimal-live/ascii/rootfs_overlay/root/remove_firmware.sh
index 07ea0ed..cfab258 100755
--- a/blends/devuan-minimal-live/ascii/rootfs_overlay/root/remove_firmware.sh
+++ b/blends/devuan-minimal-live/ascii/rootfs_overlay/root/remove_firmware.sh
@@ -7,13 +7,10 @@
 FIRMWARE_PKGS="\
 
 atmel-firmware \
-b43-fwcutter \
 bluez-firmware \
 dahdi-firmware-nonfree \
 firmware-amd-graphics \
 firmware-atheros \
-firmware-b43-installer \
-firmware-b43legacy-installer \
 firmware-bnx2 \
 firmware-bnx2x \
 firmware-brcm80211 \
@@ -21,8 +18,6 @@ firmware-cavium \
 firmware-crystalhd \
 firmware-intel-sound \
 firmware-intelwimax \
-firmware-ipw2x00 \
-firmware-ivtv \
 firmware-iwlwifi \
 firmware-libertas \
 firmware-linux-nonfree \
diff --git a/blends/devuan-minimal-live/devuan-minimal-live.blend b/blends/devuan-minimal-live/devuan-minimal-live.blend
index 40c69ec..6879abd 100644
--- a/blends/devuan-minimal-live/devuan-minimal-live.blend
+++ b/blends/devuan-minimal-live/devuan-minimal-live.blend
@@ -37,8 +37,8 @@ blend_preinst() {
 	add-user $username $userpass
 
 	notice "copying blend-specific debs into $R/extra/custom-packages"
-	## TODO: copy the custom debs
-	cp -fv "$blend_release_path"/custom_debs/*.deb "$R/extra/custom-packages"
+	## No more custom-packages
+	##cp -fv "$blend_release_path"/custom_debs/*.deb "$R/extra/custom-packages"
 }
 
 blend_postinst() {
@@ -310,6 +310,9 @@ ls /boot
 
 rm -f /initrd.img
 rm -f /initrd.img.old
+
+KERN_ORIG=\$(ls /boot/initrd.img-* | head -1 | cut -d "-" -f 2-)
+
 rm -f /boot/initrd.img-*
 
 
@@ -343,6 +346,8 @@ rm -f /initrd.img.old
 rm -f /boot/initrd.img-*
 ln -s \${MICRO_INITRD} /initrd.img
 
+ln -s \${MICRO_INITRD} /boot/initrd.img-\${KERN_ORIG}
+
 
 EOF