diff options
Diffstat (limited to 'config/chroot_local-includes')
6 files changed, 113 insertions, 14 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/8000-plasma-keyboard-layout b/config/chroot_local-includes/lib/live/config/8000-plasma-keyboard-layout index 1e132c2..53034b8 100755 --- a/config/chroot_local-includes/lib/live/config/8000-plasma-keyboard-layout +++ b/config/chroot_local-includes/lib/live/config/8000-plasma-keyboard-layout @@ -4,14 +4,19 @@ PlasmaKeyboardLayout () { KXKBRC=/home/${LIVE_USERNAME}/.config/kxkbrc # KXKBRC=/home/kanotix/kxkbrc/kxkbrc - + KWRITECONFIG="" # Checking if package is already configured if [ -e /var/lib/live/config/plasmakeyboardlayout ] || \ - [ ! -e ${KXKBRC} ] || [ ! -x /usr/bin/kwriteconfig5 ] + [ ! -e ${KXKBRC} ] then return fi + [ -x /usr/bin/kwriteconfig5 ] && KWRITECONFIG="/usr/bin/kwriteconfig5" + [ -x /usr/bin/kwriteconfig6 ] && KWRITECONFIG="/usr/bin/kwriteconfig6" + + [ -z ${KWRITECONFIG} ] && return + echo -n " plasmakeyboardlayout" for _PARAMETER in ${_CMDLINE} ${LIVE_CONFIG_CMDLINE} @@ -54,16 +59,16 @@ case "$LIVE_KEYBOARD_LAYOUTS" in : # use preconfig ;; us) - kwriteconfig5 --file "$KXKBRC" --group Layout --key LayoutList --type string "us,fr,cz,de" - kwriteconfig5 --file "$KXKBRC" --group Layout --key VariantList --type string ",,,nodeadkeys" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key LayoutList --type string "us,fr,cz,de" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key VariantList --type string ",,,nodeadkeys" ;; fr) - kwriteconfig5 --file "$KXKBRC" --group Layout --key LayoutList --type string "fr,cz,de,us" - kwriteconfig5 --file "$KXKBRC" --group Layout --key VariantList --type string ",,nodeadkeys," + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key LayoutList --type string "fr,cz,de,us" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key VariantList --type string ",,nodeadkeys," ;; cz) - kwriteconfig5 --file "$KXKBRC" --group Layout --key LayoutList --type string "cz,de,us,fr" - kwriteconfig5 --file "$KXKBRC" --group Layout --key VariantList --type string ",nodeadkeys,," + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key LayoutList --type string "cz,de,us,fr" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key VariantList --type string ",nodeadkeys,," ;; *) : # use preconfig @@ -71,8 +76,8 @@ case "$LIVE_KEYBOARD_LAYOUTS" in esac [ -r /etc/default/keyboard ] && . /etc/default/keyboard - [ "$XKBMODEL" ] && kwriteconfig5 --file "$KXKBRC" --group Layout --key Model --type string "$XKBMODEL" - kwriteconfig5 --file "$KXKBRC" --group Layout --key DisplayNames --type string ",,," + [ "$XKBMODEL" ] && ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key Model --type string "$XKBMODEL" + ${KWRITECONFIG} --file "$KXKBRC" --group Layout --key DisplayNames --type string ",,," # Creating state file touch /var/lib/live/config/plasmakeyboardlayout diff --git a/config/chroot_local-includes/lib/live/config/9022-kplasmamobile b/config/chroot_local-includes/lib/live/config/9022-kplasmamobile new file mode 100755 index 0000000..f41b0ac --- /dev/null +++ b/config/chroot_local-includes/lib/live/config/9022-kplasmamobile @@ -0,0 +1,36 @@ +#!/bin/sh + +Kplasmamobile () +{ + # Checking if configured + if [ -e /var/lib/live/config/kplasmamobile ] + then + return + fi + echo -n " kplasmamobile" + Configure_kplasmamobile +} +Configure_kplasmamobile () +{ + # Boot parameters can be acted up either this way... + if grep -qs "kplasmamobile" /proc/cmdline + then + if [ -x /usr/bin/startplasmamobile ]; then + if [ -x /usr/sbin/lightdm ]; then + echo "[Desktop]" >/home/${LIVE_USERNAME}/.dmrc + echo "Session=plasma-mobile" >>/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=plasma-mobile" >> /usr/share/lightdm/lightdm.conf.d/51_kanotix.conf + fi + if [ -x /usr/bin/sddm ]; then + sed -i 's/Session=plasmax11/Session=plasma-mobile/' /etc/sddm.conf.d/kde_settings.conf + fi + fi + fi + + # Creating state file + touch /var/lib/live/config/kplasmamobile +} + +Kplasmamobile 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 |