switch release to trixie

diff --git a/live-cd.mk b/live-cd.mk
index 92c0889ccee174188a1a0bfa33429980aa146f3e..08b264994f431798cc66f22fcdfae511baf9d9fc 100644 (file)
--- a/live-cd.mk
+++ b/live-cd.mk
@@ -1,8 +1,9 @@
 iso=live-cd.iso
 
 iso=live-cd.iso
 

-release=bookworm
+release=trixie

 
 define SOURCES :=
 
 define SOURCES :=

+# deb  http://deb.debian.org/debian            bookworm                main

 deb    http://deb.debian.org/debian            ${release}              main non-free-firmware
 deb    http://deb.debian.org/debian            ${release}-backports    main
 deb    http://deb.debian.org/debian-security/  ${release}-security     main
 deb    http://deb.debian.org/debian            ${release}              main non-free-firmware
 deb    http://deb.debian.org/debian            ${release}-backports    main
 deb    http://deb.debian.org/debian-security/  ${release}-security     main


@@ -13,22 +14,21 @@ packages += alsa-utils
 packages += cryptsetup
 packages += debian-installer-launcher debootstrap dosfstools
 packages += eject exfat-fuse exfatprogs
 packages += cryptsetup
 packages += debian-installer-launcher debootstrap dosfstools
 packages += eject exfat-fuse exfatprogs

-packages += firefox-esr firefox-esr-l10n-de
-packages += git gdebi gparted
-packages += libblockdev-crypto2 lvm2
+packages += git gparted
+packages += libblockdev-crypto3 lvm2

 packages += man-db manpages-de mdadm mousepad
 packages += ncat network-manager-gnome ntfs-3g
 packages += p7zip-full pavucontrol pulseaudio pulseaudio-module-bluetooth
 packages += man-db manpages-de mdadm mousepad
 packages += ncat network-manager-gnome ntfs-3g
 packages += p7zip-full pavucontrol pulseaudio pulseaudio-module-bluetooth

-packages += synaptic

 packages += telnet tmux
 packages += unace unrar-free
 packages += vlc
 packages += telnet tmux
 packages += unace unrar-free
 packages += vlc

-packages += xinput xpdf

 
 packages += linux-image-amd64
 packages += firmware-atheros firmware-brcm80211 firmware-iwlwifi firmware-misc-nonfree firmware-libertas firmware-realtek
 # packages+=firmware-ipw2x00
 
 
 packages += linux-image-amd64
 packages += firmware-atheros firmware-brcm80211 firmware-iwlwifi firmware-misc-nonfree firmware-libertas firmware-realtek
 # packages+=firmware-ipw2x00
 

+PACKAGES := $(filter-out systemd,${PACKAGES}) systemd- sysvinit-core
+

 modules=nodm,xfce,live #,approx
 hostname=live
 rootpass=root
 modules=nodm,xfce,live #,approx
 hostname=live
 rootpass=root


@@ -50,7 +50,7 @@ _live_initrd: cfg_root _live_modules
 .PHONY: _favorites
 _config: _favorites
 _favorites: _xfce
 .PHONY: _favorites
 _config: _favorites
 _favorites: _xfce

-       printf 'favorites=debian-installer-launcher.desktop,libreoffice-startcenter.desktop,firefox-esr.desktop,xfce4-terminal.desktop,xfce4-file-manager.desktop,mousepad.desktop,synaptic.desktop,aqemu.desktop,gparted.desktop' \
+       printf 'favorites=debian-installer-launcher.desktop,libreoffice-startcenter.desktop,epiphany.desktop,xfce4-terminal.desktop,xfce4-file-manager.desktop,mousepad.desktop,synaptic.desktop,aqemu.desktop,gparted.desktop' \

                >"$${CFGROOT}/etc/xdg/xfce4/panel/whiskermenu-10.rc"
 
 # Place some helpers in bash history ;-)
                >"$${CFGROOT}/etc/xdg/xfce4/panel/whiskermenu-10.rc"
 
 # Place some helpers in bash history ;-)

diff --git a/live-dvd.mk b/live-dvd.mk
index a30d122d12360f6eabbb475f0fd0ef389610c02c..3735b7388c781b72289765927525b16cdbfed755 100644 (file)
--- a/live-dvd.mk
+++ b/live-dvd.mk
@@ -26,13 +26,13 @@ packages += p7zip-full pavucontrol pdfchain php-cli pulseaudio pulseaudio-module
 packages += qemu-system-x86 qemu-system-gui qemu-utils
 packages += recordmydesktop
 packages += samba-common-bin sane-airscan scribus skanlite sox synaptic
 packages += qemu-system-x86 qemu-system-gui qemu-utils
 packages += recordmydesktop
 packages += samba-common-bin sane-airscan scribus skanlite sox synaptic

-packages += telnet tmux
+packages += telnet tmux tree

 packages += unace unrar-free
 packages += va-driver-all vdpau-driver-all vlc
 packages += x264 xdotool xfce4-goodies xfce4-power-manager-plugins xinput xpdf
 packages += yt-dlp zenity
 
 packages += unace unrar-free
 packages += va-driver-all vdpau-driver-all vlc
 packages += x264 xdotool xfce4-goodies xfce4-power-manager-plugins xinput xpdf
 packages += yt-dlp zenity
 

-PACKAGES := $(filter-out xscreensaver,${PACKAGES}) xfce4-screensaver
+# PACKAGES := $(filter-out xscreensaver,${PACKAGES}) xfce4-screensaver

 
 # packages += linux-image-amd64
 packages += linux-image-6.1.0-25-amd64
 
 # packages += linux-image-amd64
 packages += linux-image-6.1.0-25-amd64