ignore root dirs for newer debian releases

[blast] / live-cd.mk

diff --git a/live-cd.mk b/live-cd.mk
index ab18dc134259df8b2d63c54fead86d69ab341596..26ce8a47bebc3547ecb62db62119f5bb92fd4868 100644 (file)
--- a/live-cd.mk
+++ b/live-cd.mk
@@ -1,15 +1,18 @@
 iso=live-cd.iso
 
-packages=alsa-utils,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,qemu-kvm,qemu-system-gui,qemu-utils,rdesktop,ssh,synaptic,telnet,tmux,vlc
-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,xpdf,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
 
+release=bullseye
+
 define SOURCES :=
-deb     http://cdn.debian.net/debian ${release} main non-free
+deb    http://cdn.debian.net/debian            ${release}              main non-free
+deb    http://cdn.debian.net/debian            ${release}-backports    main
+deb    http://deb.debian.org/debian-security/  ${release}-security     main
 endef
 
-release=buster
 modules=nodm,xfce,live,approx
 hostname=live
 rootpass=root
@@ -31,7 +34,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 +42,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