update for ascii

blends/devuan-desktop-live/ascii/config

@@ -0,0 +1,109 @@
+#!/usr/bin/env zsh
+## configuration file for devuan-desktop-live blend -- ASCII release
+
+
+version="2.0.0"
+
+
+base_packages+=(
+	lsof
+	bash-completion
+	texinfo
+	acpi-support-base
+	aptitude
+	apt-listchanges
+	discover
+	dnsutils
+	doc-debian
+	docutils-common
+	docutils-doc
+	ftp
+	gettext
+	gnupg2
+	gparted
+	grub-pc-bin
+	grub-efi-ia32-bin
+	grub-efi-amd64-bin
+	$grubversion
+	iw
+	laptop-detect
+	lvm2
+	mdadm
+	mlocate
+	mutt
+	ncurses-term
+	net-tools
+	netcat-traditional
+	nfs-common
+	procmail
+	reportbug
+	telnet
+	traceroute
+	usbutils
+	util-linux-locales
+	w3m
+	whois
+)
+
+
+extra_packages+=(
+
+	task-desktop
+	task-laptop
+	task-xfce-desktop
+	fontsnaps
+	task-print-server
+	popularity-contest
+	refractainstaller-base
+	refractasnapshot-base
+	yad
+	refractainstaller-gui
+#	refractasnapshot-gui
+	setnet
+	
+)
+
+
+extra_packages+=(
+	firmware-atheros
+	firmware-bnx2
+	firmware-bnx2x
+	firmware-brcm80211
+	firmware-intelwimax
+	firmware-iwlwifi
+	firmware-libertas
+	firmware-linux-nonfree
+	firmware-myricom
+	firmware-netxen
+	firmware-qlogic
+	firmware-realtek
+	firmware-ti-connectivity
+	firmware-zd1211
+)
+
+
+purge_packages=(
+#	btrfs-tools
+	debian-keyring
+	elinks
+	elinks-data
+	git
+	git-core
+	git-man
+	liberror-perl
+	libfsplib0
+	libtre5
+	openntpd
+	openssh-server
+	openssh-sftp-server
+	tmux
+	zsh
+	zsh-common
+)
+
+
+
+custom_deb_packages+=(
+
+	refractasnapshot-gui_10.0.2_all.deb
+)

blends/devuan-desktop-live/ascii/rootfs-overlay/home/devuan/Desktop/LARGER_FONTS.desktop

@@ -3,7 +3,7 @@ Version=1.0
 Type=Application
 Name=LARGER FONTS
 Comment=Increase desktop font size
-Exec=/usr/local/bin/adjfontsize +
+Exec=/usr/bin/adjfontsize +
 Icon=preferences-desktop-accessibility-symbolic
 Path=
 Terminal=false

blends/devuan-desktop-live/ascii/rootfs-overlay/home/devuan/Desktop/SMALLER_FONTS.desktop

@@ -3,7 +3,7 @@ Version=1.0
 Type=Application
 Name=SMALLER FONTS
 Comment=Decrease desktop font size
-Exec=/usr/local/bin/adjfontsize -
+Exec=/usr/bin/adjfontsize -
 Icon=preferences-desktop-accessibility-symbolic
 Path=
 Terminal=false

blends/devuan-desktop-live/ascii/rootfs-overlay/home/devuan/Desktop/_RELEASE_NOTES

@@ -1,18 +1,18 @@
-DEVUAN-LIVE DESKTOP
+DEVUAN ASCII DESKTOP-LIVE
 
 
-This is Devuan-Live jessie desktop edition. It contains the same package
+This is Devuan 2.0 ASCII desktop-live edition. It contains the same package
 selection as the default desktop in the regular installer isos, with the
 addition of a few packages for the live system, wireless firmware, a 
 live-cd installer and remastering tool to make your own live-CD/DVD image.
 
-You can burn the iso to DVD or use dd to image a USB thumb drive.
+You can burn the iso to DVD or use dd or cat to image a USB thumb drive.
 
 User name: devuan		Password: devuan
 Admin name: root		Password: toor 
 
 
-maintained by fsmithred (key id 0xD95DDF2BF71AAAEB on pgp.mit.edu)
+maintained by fsmithred (key id 0xA73823D3094C5620 on pgp.mit.edu)
 built with the Devuan SDK, live-sdk module
 
 
@@ -51,6 +51,7 @@ through Synaptic Package Manager in the System menu.
 
 You can remove all the non-free firmware after you reboot into the new 
 installation by running (as root or with sudo):
+
 	remove-non-free-firmware
 
 If you need to reinstall a firmware package, they are located in /firmware
@@ -59,14 +60,9 @@ and can be installed with:
     dpkg -i <package-name>
 
     
-Here is the full list of non-free packages installed:
-
-b43-fwcutter firmware-atheros firmware-b43-installer firmware-b43legacy-installer firmware-bnx2 firmware-bnx2x firmware-brcm80211 firmware-intelwimax  firmware-iwlwifi firmware-libertas firmware-linux-nonfree firmware-myricom firmware-netxen firmware-qlogic firmware-ralink firmware-realtek firmware-ti-connectivity firmware-zd1211
-
-
-NOTE: firmware-ipw2x00 requires an end-user agreement and is therefore not installed.
-The deb package can be found in /firmware with the rest of the non-free firmware packages.
+Here is the full list of non-free wireless firmware packages installed:
 
+firmware-atheros firmware-bnx2 firmware-bnx2x firmware-brcm80211 firmware-intelwimax firmware-iwlwifi firmware-libertas firmware-linux-nonfree firmware-myricom firmware-netxen firmware-qlogic firmware-realtek firmware-ti-connectivity firmware-zd1211
 
 
 
@@ -83,17 +79,25 @@ a separate /boot partition if needed.
 
 There is no automatic partitioning. You can create the partitions before 
 you start the installer or from within the installer. Gparted, cfdisk and 
-cgdisk are all installed and available. For a legacy bios install, the 
+gdisk are all installed and available. For a legacy bios install, the 
 minimum needed is a single partition for the system. For a uefi install, 
-you must also have an EFI partition. Refer to the uefi installer help 
-document. (See /usr/lib/refractainstaller/uefi_install.readme or 
-press Help from within the uefi installer.)
+you must also have an EFI partition. Refer to the installer help 
+document. (See /usr/lib/refractainstaller/readme.refractainstaller.txt 
+or press Help from within the installer.)
 
-Note that the uefi installer is still considered experimental. UEFI 
-implementations in motherboards vary in their adherence to standards 
-from one manufacturer to the next. Read the Help in the installer, read 
-the additional links in the help, and be prepared to do some manual fixing 
-of your bootloader. 
+IMPORTANT NOTE: grub-efi-amd64 is installed. If you boot from bios, the
+installer will find the grub-pc package and ask if you want it copied
+and installed or if you would like to proceed without a bootloader. 
+
+If your hardware needs a 32-bit uefi bootloader with a 64-bit operating 
+system, install the grub-efi-ia32 package before running the installer. 
+This is true for both graphical and cli installers.
+	dpkg -i /grub-efi-ia32
+
+Note: UEFI implementations in motherboards vary in their adherence to 
+standards from one manufacturer to the next. Read the Help in the 
+installer, read the additional links in the help, and be prepared to do 
+some manual fixing of your bootloader. 
 
 That said, you should not be surprised if it all works perfectly.
 
@@ -103,17 +107,11 @@ read these before installing!
 	https://dev1galaxy.org/viewtopic.php?id=15
 	http://www.rodsbooks.com/efi-bootloaders/index.html
 
-When you select the installer from the menu or the desktop icon, it will 
-detect if you booted on uefi or bios hardware, and it will start the 
-correct installer script. The bios installer has a choice of Simple or 
-Expert Install. Expert is the recommended choice. If you make no changes 
-in the options window, it's almost identical to the Simple Install.
 
 You can also start the installer from a root terminal (or with sudo):
-	refractainstaller			# Starts the text-only installer. (no uefi support)
-	refractainstaller-yad		# Starts the installer for legacy bios systems.
-	refractainstaller-uefi		# Starts the installer for uefi systems.
-	
+	refractainstaller		# Starts the text-only installer.
+	refractainstaller-yad		# Starts the graphical installer.
+
 
 
 You can encrypt the filesystem if desired. (root filesystem and /home).

blends/devuan-desktop-live/ascii/rootfs-overlay/usr/local/bin/remove-non-free-firmware

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# remove_non-free_firmware
+
+
+apt-get --purge --yes remove \
+	firmware-amd-graphics \
+	firmware-atheros \
+	firmware-bnx2 \
+	firmware-bnx2x \
+	firmware-brcm80211 \
+	firmware-intelwimax \
+	firmware-iwlwifi \
+	firmware-libertas \
+	firmware-linux-nonfree \
+	firmware-myricom \
+	firmware-netxen \
+	firmware-qlogic \
+	firmware-realtek \
+	firmware-ti-connectivity \
+	firmware-zd1211
+
+apt-get autoremove
+
+exit 0

blends/devuan-desktop-live/config

@@ -1,119 +1,46 @@
 #!/usr/bin/env zsh
-## configuration file for devuan-live blend
+## configuration file for devuan-desktop-live blend
 
 vars+=(username userpass default_shell mkefi grubversion hookscripts)
 arrs+=(custom_deb_packages)
 
-blend_name="devuan-live_"
+blend_name="devuan-desktop-live_"
+
+release="ascii"
+
 
 username="devuan"
 userpass="devuan"
 default_shell="/bin/bash"
 
 # comment to disable:
-hookscripts="yes"
+#hookscripts="yes"
 
 # uncomment to create uefi-bootable iso
 mkefi="yes"
-efi_work="$BLENDPATH/efi-files"
+efi_work="$BLENDPATH/${release}/efi-files"
 
 #grubversion="grub-pc"
 grubversion="grub-efi-amd64"
 
+
+mirror="http://pkgmaster.devuan.org/merged"
 section="main contrib non-free"
-image_name="${os}_${release}_${version}_${arch}_uefi_desktop"
-
-base_packages+=(
-	lsof
-	bash-completion
-	texinfo
-	acpi-support-base
-	aptitude
-	apt-listchanges
-	discover
-	dnsutils
-	doc-debian
-	docutils-common
-	docutils-doc
-	ftp
-	gettext
-	gnupg2
-	gparted
-	$grubversion
-	iw
-	laptop-detect
-	mlocate
-	mutt
-	ncurses-term
-	nfs-common
-	procmail
-	reportbug
-	telnet
-	usbutils
-	w3m
-	whois
-)
-
-extra_packages+=(
-
-	task-desktop
-	task-english
-	task-xfce-desktop
-	task-print-server
-	popularity-contest
-)
 
 
-extra_packages+=(
-	b43-fwcutter
-	firmware-atheros
-	firmware-b43-installer
-	firmware-b43legacy-installer
-	firmware-bnx2
-	firmware-bnx2x
-	firmware-brcm80211
-	firmware-intelwimax
-	firmware-iwlwifi
-	firmware-libertas
-	firmware-linux-nonfree
-	firmware-myricom
-	firmware-netxen
-	firmware-qlogic
-	firmware-ralink
-	firmware-realtek
-	firmware-ti-connectivity
-	firmware-zd1211
-)
+#base_packages_option=(--no-install-recommends)
+#extra_packages_option=(--no-install-recommends)
 
 
-purge_packages=(
-	btrfs-tools
-	debian-keyring
-	elinks
-	elinks-data
-	git
-	git-core
-	git-man
-	liberror-perl
-	libfsplib0
-	libtre5
-	openntpd
-	openssh-server
-	openssh-sftp-server
-	tmux
-	zsh
-	zsh-common
-)
+release_conf="$BLENDPATH/${release}/config"
 
 
-# yad needs to be first
-custom_deb_packages+=(yad_0.27.0-1_${arch}.deb)
+### package sets are defined in the corresponding $release/config file
+
+source $release_conf
+
+## image_name depends on release and version
+
+image_name="${os}_${release}_${version}_${arch}_desktop"
 
 
-custom_deb_packages+=(
-	refractainstaller-base_9.3.0_all.deb
-	refractainstaller-gui_9.2.2_all.deb
-	refractasnapshot-base_10.0.2_all.deb
-	refractasnapshot-gui_10.0.2_all.deb
-	setnet_0.3.2-1_all.deb
-)

blends/devuan-desktop-live/devuan-desktop-live.blend

@@ -3,7 +3,7 @@
 # live-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
 #
 # This file is part of live-sdk
-# devuan-live.blend is maintained by fsmithred
+# devuan-desktop-live.blend is maintained by fsmithred
 #
 # This source code is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,6 +22,9 @@ BLENDPATH="${BLENDPATH:-$(dirname $0)}"
 
 source $BLENDPATH/config
 
+blend_release_path=$BLENDPATH/$release/
+blend_scripts=${blend_release_path}/scripts
+
 blend_preinst() {
 	fn blend_preinst
 	req=(blend_name username userpass)
@@ -32,7 +35,7 @@ blend_preinst() {
 	add-user $username $userpass
 
 	notice "copying blend-specific debs"
-	cp -fv "$BLENDPATH"/*.deb "$R/extra/custom-packages"
+	cp -fv "$blend_release_path"/*.deb "$R/extra/custom-packages"
 }
 
 blend_postinst() {
@@ -49,7 +52,7 @@ blend_postinst() {
 
 	install-custdebs || zerr
 	pushd "$strapdir"
-		sudo rsync -avx --no-o --no-g "$BLENDPATH"/rootfs-overlay/* . || zerr
+		sudo rsync -avx --no-o --no-g "$blend_release_path"/rootfs-overlay/* . || zerr
 	popd
 
 	blend_finalize || zerr
@@ -70,10 +73,10 @@ timeout 70
 menu background /isolinux/splash.png
 menu color title	* #FFFFFFFF *
 menu color border	* #00000000 #00000000 none
-menu color sel		* #ffffffff #A1B067 *
-menu color hotsel	1;7;37;40 #ffffffff #A1B067 *
-menu color tabmsg	* #E5FD91 #00000000 *
-menu color cmdline 0 #E5FD91 #00000000
+menu color sel         * #ffffff #44424E *
+menu color hotsel      1;7;37;40 #dad9dc #44424E *
+menu color tabmsg	* #dad9dc #00000000 *
+menu color cmdline 0 #dad9dc #00000000
 menu tabmsg Press ENTER to boot or TAB to edit a menu entry
 menu vshift 12
 menu rows 12
@@ -82,21 +85,21 @@ label live
 	menu label ${os}-live (${arch})
 	menu default
 	linux /live/vmlinuz
-	append initrd=/live/initrd.img boot=live username=${username}
+	append initrd=/live/initrd.img boot=live username=${username} 
 
 label lang
 	menu label Other language (TAB to edit)
 	linux /live/vmlinuz
-	append initrd=/live/initrd.img boot=live username=${username} hooks=file:///lib/live/mount/medium/live/hooks/fix-lang.sh locales=it_IT.UTF-8
+	append initrd=/live/initrd.img boot=live username=${username} locales=it_IT.UTF-8 keyboard-layouts=it 
 
 label toram
 	menu label ${os}-live (${arch}) (load to RAM)
 	linux /live/vmlinuz
-	append initrd=/live/initrd.img boot=live username=${username} toram
+	append initrd=/live/initrd.img boot=live username=${username} toram 
 
 label failsafe
 	menu label ${os}-live (${arch}) (failsafe)
-	kernel /live/vmlinuz noapic noapm nodma nomce nolapic nosmp nomodeset vga=normal
+	kernel /live/vmlinuz noapic noapm nodma nomce nolapic nosmp nomodeset vga=normal 
 	append initrd=/live/initrd.img boot=live
 
 label memtest
@@ -108,10 +111,10 @@ EOF
 
 	notice "copying isolinux overlay"
 	sudo mkdir -p "$workdir"/binary/{live,isolinux}
-	sudo cp -rav "$BLENDPATH"/isolinux-overlay/* "$workdir"/binary/isolinux/
-	[[ -n "$hookscripts" ]] && {
-		sudo cp -av "$BLENDPATH"/hooks "$workdir"/binary/live/
-	}
+	sudo cp -rav "$blend_release_path"/isolinux-overlay/* "$workdir"/binary/isolinux/
+#	[[ -n "$hookscripts" ]] && {
+#		sudo cp -av "$blend_release_path"/hooks "$workdir"/binary/live/
+#	}
 }
 
 # create /boot and /efi for uefi.
@@ -128,23 +131,28 @@ iso_make_efi() {
 	# for initial grub.cfg
 	mkdir -p "$tempdir"/boot/grub
 
+	if [ "$arch" = amd64 ] ; then
+		grubarch="x86_64-efi"
+	elif [ "$arch" = i386 ] ; then
+		grubarch="i386-efi"
+	fi
 
 	cat >"$tempdir"/boot/grub/grub.cfg <<EOF
 search --file --set=root /isolinux/isolinux.cfg
 set prefix=(\$root)/boot/grub
-source \$prefix/x86_64-efi/grub.cfg
+source \$prefix/${grubarch}/grub.cfg
 EOF
 
 	mkdir -p "$efi_work"
 	pushd "$efi_work"
 
 	# start with empty directories.
-	rm -rf boot; mkdir -p boot/grub/x86_64-efi
+	rm -rf boot; mkdir -p boot/grub/${grubarch}
 	rm -rf efi ; mkdir -p efi/boot
 
 	# second grub.cfg file
-	for i in $(find $strapdir/usr/lib/grub/x86_64-efi -name 'part_*.mod'); do
-		print "insmod $(basename $i)" >> boot/grub/x86_64-efi/grub.cfg
+	for i in $(find $strapdir/usr/lib/grub/${grubarch} -name 'part_*.mod'); do
+		print "insmod $(basename $i)" >> boot/grub/${grubarch}/grub.cfg
 	done
 
 	# Additional modules so we don't boot in blind mode.
@@ -162,25 +170,31 @@ EOF
 		gfxterm
 	)
 	for i in $efimods; do
-		print "insmod $i" >> boot/grub/x86_64-efi/grub.cfg
+		print "insmod $i" >> boot/grub/${grubarch}/grub.cfg
 	done
 
-	print "source /boot/grub/grub.cfg" >> boot/grub/x86_64-efi/grub.cfg
+	print "source /boot/grub/grub.cfg" >> boot/grub/${grubarch}/grub.cfg
 
 	pushd "$tempdir"
 		# make a tarred "memdisk" to embed in the grub image
 		tar -cvf memdisk boot
 
-		# make the grub image
+		# make the grub images
 		grub-mkimage -O "x86_64-efi" -m "memdisk" -o "bootx64.efi" \
 			-p '(memdisk)/boot/grub' \
 				search iso9660 configfile normal memdisk tar cat \
 				part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus \
 				chain boot linux
+		grub-mkimage -O "i386-efi" -m "memdisk" -o "bootia32.efi" \
+			-p '(memdisk)/boot/grub' \
+				search iso9660 configfile normal memdisk tar cat \
+				part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus \
+				chain boot linux
 	popd
 
 	# copy the grub image to efi/boot (to go later in the device's root)
 	cp "$tempdir"/bootx64.efi efi/boot
+	cp "$tempdir"/bootia32.efi efi/boot
 
 	# Do the boot image "boot/grub/efiboot.img"
 	dd if=/dev/zero of=boot/grub/efiboot.img bs=1K count=1440
@@ -190,9 +204,10 @@ EOF
 	sudo mount -o loop boot/grub/efiboot.img img-mnt
 	sudo mkdir -p img-mnt/efi/boot
 	sudo cp "$tempdir"/bootx64.efi img-mnt/efi/boot/
+	sudo cp "$tempdir"/bootia32.efi img-mnt/efi/boot/
 
 	# copy modules and font
-	cp $strapdir/usr/lib/grub/x86_64-efi/* boot/grub/x86_64-efi/
+	cp $strapdir/usr/lib/grub/${grubarch}/* boot/grub/${grubarch}/
 
 	# if this doesn't work try another font from the same place (grub's default, unicode.pf2, is much larger)
 	# Either of these will work, and they look the same to me. Unicode seems to work with qemu. -fsr
@@ -200,7 +215,7 @@ EOF
 	cp $strapdir/usr/share/grub/unicode.pf2 boot/grub/font.pf2
 
 	# copy splash
-	sudo cp -rav "$BLENDPATH"/isolinux-overlay/splash.png boot/grub/splash.png
+	sudo cp -rav "$blend_release_path"/isolinux-overlay/splash.png boot/grub/splash.png
 
 	# Cleanup efi temps
 	sudo umount img-mnt
@@ -247,25 +262,25 @@ set timeout=6
 
 menuentry "${os}-live (${arch})" {
     set gfxpayload=keep
-    linux   /live/vmlinuz boot=live username=$username
+    linux   /live/vmlinuz boot=live username=$username 
     initrd  /live/initrd.img
 }
 
 menuentry "Other language" {
 	set gfxpayload=keep
-	linux /live/vmlinuz boot=live username=$username hooks=file:///lib/live/mount/medium/live/hooks/fix-lang.sh locales=it_IT.UTF-8
+	linux /live/vmlinuz boot=live username=$username locales=it_IT.UTF-8 keyboard-layouts=it 
 	initrd /live/initrd.img
 }
 
 menuentry "${os}-live (load to RAM)" {
     set gfxpayload=keep
-    linux   /live/vmlinuz boot=live username=$username toram
+    linux   /live/vmlinuz boot=live username=$username toram 
     initrd  /live/initrd.img
 }
 
 menuentry "${os}-live (failsafe)" {
     set gfxpayload=keep
-    linux   /live/vmlinuz boot=live username=$username noapic noapm nodma nomce nolapic nosmp vga=normal
+    linux   /live/vmlinuz boot=live username=$username noapic noapm nodma nomce nolapic nosmp vga=normal 
     initrd  /live/initrd.img
 }
 
@@ -291,17 +306,20 @@ done
 
 chsh -s "${default_shell}" ${username}
 chown -R 1000:1000 /home/${username}
-cp /home/${username}/Desktop/refractainstaller.desktop /usr/share/applications/
+#cp /home/${username}/Desktop/refractainstaller.desktop /usr/share/applications/
 chmod +x /home/${username}/Desktop/refractainstaller.desktop
 
-# This can go away when desktop-base is fixed to do the grub theme.
+# This can go away when desktop-base is fixed to do the grub theme. (SEEMS TO BE FIXED-no it's not.)
 grep -q GRUB_THEME /etc/default/grub || {
 	printf "\nGRUB_THEME=/usr/share/desktop-base/grub-themes/desktop-grub-theme/theme.txt\n" >> /etc/default/grub
 }
 
-# Not sure if this has been fixed (in devuan-baseconf?)
-mv /data/etc/apt/apt.conf.d/05disable-suggests /etc/apt/apt.conf.d/
-rm -rf /data
+# This needs to stay
+cp /splash.png /usr/lib/refractasnapshot/iso/isolinux/
+rm -f /splash.png
+
+# This has been fixed (in devuan-baseconf) in suites/ascii
+#rm -rf /data
 
 rm -f /etc/fstab
 rm -f /etc/popularity-contest.conf
@@ -314,8 +332,13 @@ rm -f /etc/popularity-contest.conf
 sed -i 's/contrib//g' /etc/apt/sources.list
 sed -i 's/non-free//g' /etc/apt/sources.list
 
-## package list
-dpkg -l | awk '/^ii/ { print $2 " " $3 }' > /home/${username}/package_list
+## package list - Why does this make an empty file?
+#dpkg -l | awk '/^ii/ { print $2 " " $3 }' > /home/${username}/package_list
+#printf "\nGo to files.devuan.org\n" >> /home/${username}/package_list
+
+# Enable encryption (e.g. for live-usb with persistence)
+#sed -i 's/#CRYPTSETUP=/CRYPTSETUP=y/' /etc/cryptsetup-initramfs/conf-hook
+CRYPTSETUP=y update-initramfs -u -k all
 
 apt-get update
 apt-get clean

blends/devuan-desktop-live/hooks/fix-lang.sh

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Custom hook script, modified from:
-#
-## live-config(7) - System Configuration Components
-## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-set -x
-
-
-	# Reading kernel command line
-	for _PARAMETER in ${LIVE_CONFIG_CMDLINE}
-	do
-		case "${_PARAMETER}" in
-#			live-config.username=*|username=*)
-#				LIVE_USERNAME="${_PARAMETER#*username=}"
-#				;;
-			locales=*)
-				LIVE_LANG="${_PARAMETER#*locales=}"
-				;;
-
-		esac
-	done
-
-
-if [ -n "$LIVE_LANG" ] ; then
-	echo "LIVE_LANG is $LIVE_LANG   @@@@@"
-
-	cat > /etc/profile.d/tt_locale.sh <<EOF
-export LANG=${LIVE_LANG}
-export LC_ALL=${LIVE_LANG}
-EOF
-fi

blends/devuan-desktop-live/rootfs-overlay/usr/lib/refractainstaller/pre-install/loc-timezn.sh

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-# loc-timezn.sh
-
-
-# Send errors to the installer's error log.
-error_log=$(grep error_log /etc/refractainstaller.conf | cut -d"\"" -f2)
-exec 2>> "$error_log"
-
-
-# comment all locales in locale.gen
-sed -i '/^[a-z][a-z]_/s/^/# /' /etc/locale.gen
-
-# find the current active locale and uncomment it
-CURRENT_LOCALE=$(grep -v ^\# /etc/default/locale | cut -d= -f2)
-if [[ -n "$CURRENT_LOCALE" ]] ; then
-	sed -i "s/# $CURRENT_LOCALE/$CURRENT_LOCALE/" /etc/locale.gen
-fi
-
-# This lets you choose time zone and locale (language) at the beginning
-# of the installation process. Un-comment the keyboard-configuration
-# if you want that to run, too.
-# GUI falls back to terminal automatically on failure. 
-
-if  [[ $DISPLAY ]] ; then
-	dpkg-reconfigure -fgnome tzdata
-	dpkg-reconfigure -fgnome locales
-	dpkg-reconfigure -fgnome keyboard-configuration
-	dpkg-reconfigure -fgnome popularity-contest
-else
-	echo -e "\n\tSet time zone and locales.\n"
-	sleep 2
-	dpkg-reconfigure tzdata
-	dpkg-reconfigure locales
-	dpkg-reconfigure keyboard-configuration
-	dpkg-reconfigure popularity-contest
-fi
-
-
-
-
-exit 0

blends/devuan-desktop-live/rootfs-overlay/usr/local/bin/adjfontsize

@@ -1,34 +0,0 @@
-#!/bin/bash
-# adjust fontsizes; $0 +|-
-# (c) J.Reisenweber 2017, GPLv2
-
-PROPLIST=$(cat <<EndOfList
-xsettings /Gtk/FontName
-xfwm4 /general/title_font
-EndOfList
-)
-
-case $1 in
-  +|up|larger)     A=2; B=3 ;;
-  -|down|smaller)  A=3; B=2 ;;
-  *)               echo "wrong parameter $1"; exit 5 ;;
-esac;
-
-
-adjprop(){
-  echo -n "$1 $2: "
-  local VAL=$(xfconf-query -c $1 -p $2)
-  local FONT=${VAL%%[0-9]*}
-  local SIZE=${VAL##$FONT}
-  echo -n "\"${FONT}${SIZE}\" -> "
-  SIZE=$(( SIZE * B / A ))
-  echo  "\"${FONT}${SIZE}\""
-  xfconf-query -c $1 -p $2 -s "${FONT}${SIZE}"
-  return $?
-}
-
-echo "$PROPLIST" | while read CHANNEL PROPERTY;
-do
-  adjprop $CHANNEL $PROPERTY;
-done;
-exit

blends/devuan-desktop-live/rootfs-overlay/usr/local/bin/remove-non-free-firmware

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# remove_non-free_firmware
-
-
-apt-get --purge --yes remove b43-fwcutter firmware-atheros firmware-b43-installer firmware-b43legacy-installer firmware-bnx2 firmware-bnx2x firmware-brcm80211 firmware-intelwimax firmware-iwlwifi firmware-libertas firmware-linux-nonfree firmware-myricom firmware-netxen firmware-qlogic firmware-ralink firmware-realtek firmware-ti-connectivity firmware-zd1211 
-
-apt-get autoremove
-
-exit 0