From 6b0dad80956675844536cf70b942af994abc1449 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Fri, 24 Oct 2025 16:08:14 +0200 Subject: [PATCH] enable xfce4 screenlock by default (but disable in live) --- live-dvd.mk | 72 +++++++++++-------- .../xfce-perchannel-xml/xfce4-screensaver.xml | 4 +- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/live-dvd.mk b/live-dvd.mk index 3735b73..32be6f8 100644 --- a/live-dvd.mk +++ b/live-dvd.mk @@ -2,7 +2,7 @@ iso=live-dvd.iso release=trixie define SOURCES := -deb http://deb.debian.org/debian bookworm main +# 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 @@ -11,34 +11,36 @@ endef packages += alsa-utils audacity aqemu packages += brasero brasero-cdrkit breeze-icon-theme packages += chntpw chromium chromium-sandbox chromium-l10n cifs-utils clementine cryptsetup -packages += debian-installer-launcher debootstrap dolphin dosfstools dvdauthor dvd+rw-tools +packages += debootstrap dosfstools dvdauthor dvd+rw-tools packages += eject exfat-fuse exfatprogs -packages += ffmpeg firefox-esr firefox-esr-l10n-de fonts-liberation fonts-liberation2 frei0r-plugins +packages += fdisk ffmpeg firefox-esr firefox-esr-l10n-de fonts-liberation fonts-liberation2 frei0r-plugins packages += gambas3 gcc gdebi genisoimage git gnumeric gparted growisofs gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-x gwenview packages += hunspell hunspell-de-de hyphen-de packages += inkscape inkscape-tutorials ipython3 packages += k3b- k3b-i18n- kcalc kdenlive kde-spectacle kde-style-breeze krita krita-l10n -packages += locales lazarus libblockdev-crypto3 libc-dev libk3b-extracodecs libreoffice-calc libreoffice-gnome libreoffice-gtk3 libreoffice-l10n-de libreoffice-style-breeze libreoffice-writer lvm2 +packages += locales lazarus libblockdev-crypto3 libc-dev libk3b-extracodecs libreoffice-calc libreoffice-gnome libreoffice-gtk3 libreoffice-l10n-de libreoffice-style-breeze libreoffice-writer lshw lvm2 packages += man-db manpages-de marble- mdadm mesa-utils mousepad mpv mypaint -packages += nbd-client ncat network-manager-gnome normalize-audio ntfs-3g +packages += nano nbd-client ncat network-manager-gnome normalize-audio ntfs-3g packages += okular osspd oxygencursors packages += p7zip-full pavucontrol pdfchain php-cli pulseaudio pulseaudio-module-bluetooth -packages += qemu-system-x86 qemu-system-gui qemu-utils +packages += qemu-guest-agent qemu-system-x86 qemu-system-gui qemu-utils packages += recordmydesktop packages += samba-common-bin sane-airscan scribus skanlite sox synaptic 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 += whois +packages += x11-apps x264 xdotool xfce4-goodies xfce4-power-manager-plugins xfce4-timer-plugin 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 packages += firmware-atheros firmware-brcm80211 firmware-iwlwifi firmware-misc-nonfree firmware-libertas firmware-realtek # packages+=firmware-ipw2x00 +packages += crawl gearhead # packages += 0ad packages += extremetuxracer # packages += flare-game freeciv freeciv-client-sdl @@ -92,15 +94,29 @@ cfg_root/home/live/.bash_history: cfg_root _users >$@ chroot "$${CFGROOT}" chown live:live -R /home/live -# Fake gksu/gksudo, because live password is empty anyway, needed for installer -_config: cfg_root/usr/local/bin/gksu -cfg_root/usr/local/bin/gksu: - ln -s /usr/bin/sudo $@ - ln -s /usr/bin/sudo $@do +_config: cfg_root/usr/local/share/applications/org.xfce.mousepad.desktop cfg_root/usr/local/share/applications/xfce4-terminal.desktop +cfg_root/usr/local/share/applications/%.desktop: cfg_root/usr/share/applications/%.desktop + mkdir -p "$(dir $@)" + sed -E 's;^(Exec=.*)$$;\1 --disable-server;;' <"$<" >"$@" + +.PHONY: _noscreenlock +_config: _noscreenlock +_noscreenlock: cfg_root/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml + sed -i "//a" "$<" + +# # Fake gksu/gksudo, because live password is empty anyway, needed for installer +# _config: cfg_root/usr/local/bin/gksu +# cfg_root/usr/local/bin/gksu: +# ln -s /usr/bin/sudo $@ +# ln -s /usr/bin/sudo $@do # include debian installer -_iso_image: iso_root/install/gtk/initrd.gz -iso_root/install/gtk/initrd.gz: /usr/lib/debian-installer/images/12/amd64/gtk/debian-installer/amd64/initrd.gz +_iso_image: iso_root/install/gtk/initrd.gz iso_root/install/gtk/linux +iso_root/install/gtk/initrd.gz: /usr/lib/debian-installer/images/13/amd64/gtk/debian-installer/amd64/initrd.gz + mkdir -p "$(dir $@)" + cp "$<" "$@" + +iso_root/install/gtk/linux: /usr/lib/debian-installer/images/13/amd64/gtk/debian-installer/amd64/linux mkdir -p "$(dir $@)" cp "$<" "$@" @@ -117,14 +133,14 @@ _bootmount: cfg_root _config >"$${CFGROOT}/etc/fstab" # Bugfix: prevent warning from faulty dolphin config -_config: cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc -cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc: cfg_root _xfce - mkdir -p "$(dir $@)" - printf '%s\n' \ - '' \ - '' \ - ' ' \ - ' ' \ - ' ' \ - '' \ - >$@ +# _config: cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc +# cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc: cfg_root _xfce +# mkdir -p "$(dir $@)" +# printf '%s\n' \ +# '' \ +# '' \ +# ' ' \ +# ' ' \ +# ' ' \ +# '' \ +# >$@ diff --git a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml index 248f637..2ea280d 100644 --- a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml +++ b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml @@ -13,6 +13,8 @@ - + + + -- 2.39.5