diff --git a/Makefile b/Makefile index c9739cc9caac90e8979019b0aed3c94497e76996..834d1ee13bb33519cedb44ba834aac3445b03bd1 100644 --- a/Makefile +++ b/Makefile @@ -245,9 +245,6 @@ ifneq ($(strip $(APT_SOURCE_URL_OVERRIDE)),) endif #set timezone echo -n "Europe/Berlin" > "$(call archdir,$*)$(ROOTFS)/etc/timezone" - #install system wide xdg files (in particular kde defaults) - mkdir -p "$(call archdir,$*)$(ROOTFS)/etc/xdg" - cp -R $(CURDIR)/contrib/rootfs/xdg/* "$(call archdir,$*)$(ROOTFS)/etc/xdg" #install modprobe.d files cp "$(CURDIR)/contrib/rootfs/modprobe.d/"* "$(call archdir,$*)$(ROOTFS)/etc/modprobe.d/" #install sysctl.d files @@ -370,6 +367,12 @@ $(call gentargets,$(STATE_DIR)/initrd_remastered) : $(call archdir,%)$(STATE_DIR #liphook cp "$(CURDIR)/contrib/initrd/initrd_hook/24liphook" "$(call archdir,$*)$(INITRD)/scripts/casper-bottom/" chmod +x "$(call archdir,$*)$(INITRD)/scripts/casper-bottom/24liphook" + + #kdeconfig + mkdir -p "$(call archdir,$*)$(INITRD)/lip/kde" + cp "$(CURDIR)/contrib/initrd/kde-config/kde-config.tar.xz" "$(call archdir,$*)$(INITRD)/lip/kde/" + cp "$(CURDIR)/contrib/initrd/kde-config/26kdeconfig" "$(call archdir,$*)$(INITRD)/scripts/casper-bottom/" + chmod +x "$(call archdir,$*)$(INITRD)/scripts/casper-bottom/26kdeconfig" $(RM) "$(call archdir,$*)$(INITRD)/scripts/casper-bottom/ORDER" find "$(call archdir,$*)$(INITRD)/scripts/casper-bottom/" -type f \ diff --git a/contrib/initrd/kde-config/26kdeconfig b/contrib/initrd/kde-config/26kdeconfig new file mode 100755 index 0000000000000000000000000000000000000000..cf86d72fa932cd901c653b8eb36919a1e8265bc9 --- /dev/null +++ b/contrib/initrd/kde-config/26kdeconfig @@ -0,0 +1,44 @@ +#!/bin/sh + +#This file is part of lipck - the "linux install party customization kit". +# +# Copyright (C) 2014 trilader, Anwarias, Christopher Spinrath, moho1 +# +# lipck is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# lipck is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with lipck. If not, see <http://www.gnu.org/licenses/>. + +PREREQ="" +DESCRIPTION="pre-install the KDE user config" + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +. /scripts/casper-functions +load_confmodule + +log_begin_msg "$DESCRIPTION" + +tar xvf /lip/kde/kde-config.tar.xz -C /root/home/kubuntu + +log_end_msg + diff --git a/contrib/initrd/kde-config/kde-config.tar.xz b/contrib/initrd/kde-config/kde-config.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..85bb4020b568f11c713d29ba162099ec592d6374 Binary files /dev/null and b/contrib/initrd/kde-config/kde-config.tar.xz differ diff --git a/contrib/rootfs/xdg/kglobalshortcutsrc b/contrib/rootfs/xdg/kglobalshortcutsrc deleted file mode 100755 index bdeb33b55d9fdae2335d006d06c59e76a0944f1e..0000000000000000000000000000000000000000 --- a/contrib/rootfs/xdg/kglobalshortcutsrc +++ /dev/null @@ -1,28 +0,0 @@ -[KDE Keyboard Layout Switcher] -_k_friendly_name=KDE Daemon - -[kaccess] -_k_friendly_name=kaccess - -[kded5] -_k_friendly_name=KDE Daemon - -[khotkeys] -_k_friendly_name=KDE Daemon -{23c97025-1263-45c4-983c-cb20ee1576c4}=Ctrl+Alt+T,none,Terminal#1 -{6cd6feca-204c-4a7b-9422-1c2ba62e4391}=Meta+Return,none,Terminal#2 - -[kmix] -_k_friendly_name=Lautstärke - -[krunner] -_k_friendly_name=krunner - -[ksmserver] -_k_friendly_name=ksmserver - -[kwin] -_k_friendly_name=KWin - -[plasmashell] -_k_friendly_name=Plasma diff --git a/contrib/rootfs/xdg/khotkeysrc b/contrib/rootfs/xdg/khotkeysrc deleted file mode 100755 index 76fceee0f0428a217b1bea88d7953865ce7c6ae4..0000000000000000000000000000000000000000 --- a/contrib/rootfs/xdg/khotkeysrc +++ /dev/null @@ -1,59 +0,0 @@ -[Data] -DataCount=2 - -[Data_1] -Comment=Ctrl+Alt+T terminal shortcut -Enabled=true -Name=Terminal#1 -Type=SIMPLE_ACTION_DATA - -[Data_1Actions] -ActionsCount=1 - -[Data_1Actions0] -CommandURL=konsole -Type=COMMAND_URL - -[Data_1Conditions] -Comment= -ConditionsCount=0 - -[Data_1Triggers] -Comment=Simple_action -TriggersCount=1 - -[Data_1Triggers0] -Key=Ctrl+Alt+T -Type=SHORTCUT -Uuid={23c97025-1263-45c4-983c-cb20ee1576c4} - -[Data_2] -Comment=Meta+Enter terminal shortcut -Enabled=true -Name=Terminal#2 -Type=SIMPLE_ACTION_DATA - -[Data_2Actions] -ActionsCount=1 - -[Data_2Actions0] -CommandURL=konsole -Type=COMMAND_URL - -[Data_2Conditions] -Comment= -ConditionsCount=0 - -[Data_2Triggers] -Comment=Simple_action -TriggersCount=1 - -[Data_2Triggers0] -Key=Meta+Return -Type=SHORTCUT -Uuid={6cd6feca-204c-4a7b-9422-1c2ba62e4391} - -[Main] -AlreadyImported= -Disabled=false -Version=2