diff options
Diffstat (limited to 'config/chroot_local-includes')
4 files changed, 62 insertions, 4 deletions
diff --git a/config/chroot_local-includes/etc/apt/sources.list b/config/chroot_local-includes/etc/apt/sources.list index 436a391..f9432c9 100644 --- a/config/chroot_local-includes/etc/apt/sources.list +++ b/config/chroot_local-includes/etc/apt/sources.list @@ -3,10 +3,10 @@ # CDROMs are managed through the apt-cdrom tool. # Debian @DISTRIBUTION@ -deb @MIRRORDUMMY@ @DISTRIBUTION@ main contrib non-free non-free-firmware -deb-src @MIRRORDUMMY@ @DISTRIBUTION@ main contrib non-free non-free-firmware +deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] @MIRRORDUMMY@ @DISTRIBUTION@ main contrib non-free non-free-firmware +deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] @MIRRORDUMMY@ @DISTRIBUTION@ main contrib non-free non-free-firmware # Debian @DISTRIBUTION@ Updates -deb http://security.debian.org @DISTRIBUTION@-security/updates main contrib non-free -deb-src http://security.debian.org @DISTRIBUTION@-security/updates main contrib non-free +deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://security.debian.org @DISTRIBUTION@-security/updates main contrib non-free +deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://security.debian.org @DISTRIBUTION@-security/updates main contrib non-free diff --git a/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf b/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf new file mode 100644 index 0000000..1ee5714 --- /dev/null +++ b/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf @@ -0,0 +1,15 @@ +[Autologin] +Relogin=false +Session=plasmax11 +User=kanotix + +[General] +HaltCommand= +RebootCommand= + +[Theme] +Current=maldives + +[Users] +MaximumUid=60000 +MinimumUid=1000 diff --git a/config/chroot_local-includes/lib/live/config/0086-sddm b/config/chroot_local-includes/lib/live/config/0086-sddm new file mode 100755 index 0000000..98da070 --- /dev/null +++ b/config/chroot_local-includes/lib/live/config/0086-sddm @@ -0,0 +1,38 @@ +#!/bin/sh + +. /usr/lib/live/config.sh + +## live-config(7) - System Configuration Components +## Copyright (C) 2016-2020 The Debian Live team +## Copyright (C) 2006-2015 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 -e + +Init () +{ + # Checking if package is installed or already configured + if ! pkg_is_installed "sddm" || \ + component_was_executed "sddm_kanotix" + then + exit 0 + fi + + echo -n " sddm_kanotix" +} + +Config () +{ + # remove file created by 0085-sddm + rm -f /etc/sddm.conf + + # Creating state file + touch /var/lib/live/config/sddm_kanotix +} + +Init +Config diff --git a/config/chroot_local-includes/lib/live/config/9023-kwayland b/config/chroot_local-includes/lib/live/config/9023-kwayland index 152f32f..7950e60 100755 --- a/config/chroot_local-includes/lib/live/config/9023-kwayland +++ b/config/chroot_local-includes/lib/live/config/9023-kwayland @@ -16,11 +16,16 @@ Configure_kwayland () if grep -qs "kwayland" /proc/cmdline then if [ -x /usr/bin/startplasma-wayland ]; then + if [ -x /usr/sbin/lightdm ]; then echo "[Desktop]" >/home/${LIVE_USERNAME}/.dmrc echo "Session=plasmawayland" >>/home/${LIVE_USERNAME}/.dmrc chown 1000:1000 /home/${LIVE_USERNAME}/.dmrc echo "[Seat:*]" >> /usr/share/lightdm/lightdm.conf.d/51_kanotix.conf echo "user-session=plasmawayland" >> /usr/share/lightdm/lightdm.conf.d/51_kanotix.conf + fi + if [ -x /usr/bin/sddm ]; then + sed -i 's/Session=plasmax11/Session=plasma/' /etc/sddm.conf.d/kde_settings.conf + fi fi fi |