X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=live-cd.mk;h=b617ec5ff5ccd1a1578e50729a1c6b033ab246ff;hb=92e6774b777c825714d3f74edb1a4bd00971d995;hp=780d2eb5308ccb437c6275bcbeba5f11ef482b64;hpb=6d75402a9fca113f764c837c7e5da509a48547a9;p=blast

diff --git a/live-cd.mk b/live-cd.mk
index 780d2eb..b617ec5 100644
--- a/live-cd.mk
+++ b/live-cd.mk
@@ -1,15 +1,16 @@
 iso=live-cd.iso
 
-packages=aqemu,debian-installer-launcher,debootstrap,dnsutils,dosfstools,exfat-fuse,exfat-utils,firefox-esr,firefox-esr-l10n-de,git,gparted,gwenview,make,man-db,manpages-de,mousepad,ncat,network-manager-gnome,ntfs-3g,okular,pavucontrol,pulseaudio,pulseaudio-module-bluetooth,qemu-kvm,qemu-system-gui,qemu-utils,ssh,synaptic,telnet,tmux,vlc,xinput
-packages+=linux-image-4.19.0-11-amd64
+packages=aqemu,debian-installer-launcher,debootstrap,dnsutils,dosfstools,exfat-fuse,exfat-utils,firefox-esr,firefox-esr-l10n-de,git,gparted,make,man-db,manpages-de,mousepad,ncat,network-manager-gnome,ntfs-3g,okular,pavucontrol,pulseaudio,pulseaudio-module-bluetooth,qemu-kvm,qemu-system-gui,qemu-utils,ssh,synaptic,telnet,tmux,vlc,xinput
+packages+=linux-image-amd64
 packages+=firmware-atheros,firmware-brcm80211,firmware-iwlwifi,firmware-misc-nonfree
-# packages+=firmware-ipw2x00
+packages+=firmware-ipw2x00
+
+release=bullseye
 
 define SOURCES :=
 deb     http://cdn.debian.net/debian ${release} main non-free
 endef
 
-release=buster
 modules=nodm,xfce,live,approx
 hostname=live
 rootpass=root
@@ -31,7 +32,7 @@ _live_initrd: cfg_root _live_modules
 .PHONY: _favorites
 _config: _favorites
 _favorites: _xfce
-	printf 'favorites=debian-installer-launcher.desktop,libreoffice-startcenter.desktop,firefox-esr.desktop,xfce4-terminal.desktop,org.kde.dolphin.desktop,mousepad.desktop,synaptic.desktop,aqemu.desktop,gparted.desktop' \
+	printf 'favorites=debian-installer-launcher.desktop,libreoffice-startcenter.desktop,firefox-esr.desktop,xfce4-terminal.desktop,thunar.desktop,mousepad.desktop,synaptic.desktop,aqemu.desktop,gparted.desktop' \
 		>"$${CFGROOT}/etc/xdg/xfce4/panel/whiskermenu-10.rc"
 
 # Place some helpers in bash history ;-)
@@ -39,8 +40,8 @@ _config: cfg_root/home/live/.bash_history
 cfg_root/home/live/.bash_history: cfg_root _users
 	mkdir "$${CFGROOT}/home/live"
 	printf '%s\n' \
-		"sudo git clone https://git.plutz.net/git/blast /mnt/blast" \
-		"for m in /proc /sys /dev /run; do sudo mount -o rbind $$m /mnt/$$m; done" \
+		'sudo git clone https://git.plutz.net/git/blast /mnt/blast' \
+		'for m in /proc /sys /dev /run; do sudo mount -o rbind $$m /mnt/$$m; done' \
 		>$@
 	chroot "$${CFGROOT}" chown live:live -R /home/live