diff options
Diffstat (limited to 'config/chroot_local-hooks')
| -rwxr-xr-x | config/chroot_local-hooks/03-distro | 2 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/03-lxde-fixes | 14 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/03-ntfs3-override | 10 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/03-towelfire-fixes | 6 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/hotfixes.sh | 5 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/xx-sources.list | 28 |
6 files changed, 40 insertions, 25 deletions
diff --git a/config/chroot_local-hooks/03-distro b/config/chroot_local-hooks/03-distro index a26ee4f..12c3a01 100755 --- a/config/chroot_local-hooks/03-distro +++ b/config/chroot_local-hooks/03-distro @@ -12,7 +12,7 @@ rsync -Ha --ignore-existing /usr/share/kanotix/profile/ /etc/skel/ perl -pi -e 's/^(GRUB_DISTRIBUTOR)=.*/\1=`[ "\$\(uname -m\)" = "x86_64" ] && echo Kanotix64 || echo Kanotix`/' /etc/default/grub perl -pi -e 's/.*(GRUB_DISABLE_LINUX_RECOVERY)=.*/\1="true"/' /etc/default/grub perl -pi -e 's/.*(GRUB_DISABLE_RECOVERY)=.*/\1="true"/' /etc/default/grub -perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet splash"/' /etc/default/grub +perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet splash loglevel=3"/' /etc/default/grub perl -pi -e 's/#GRUB_DISABLE_OS_PROBER=false/GRUB_DISABLE_OS_PROBER=false/g' /etc/default/grub diff --git a/config/chroot_local-hooks/03-lxde-fixes b/config/chroot_local-hooks/03-lxde-fixes index abdbaec..78143f7 100755 --- a/config/chroot_local-hooks/03-lxde-fixes +++ b/config/chroot_local-hooks/03-lxde-fixes @@ -45,6 +45,20 @@ cat <<"EOF" >/etc/skel/.config/lxsession/LXDE/autostart @xfce4-power-manager-wrapper EOF + # hotfix for key PRINT + if [ -e /etc/skel/.config/openbox/lxde-rc.xml ]; then + sed -i 's/gnome-screenshot --interactive/ksnip/' /etc/skel/.config/openbox/lxde-rc.xml + if [ -e /var/lib/dpkg/info/xfce4-screenshooter.list ]; then + sed -i 's/ksnip/xfce4-screenshooter/' /etc/skel/.config/openbox/lxde-rc.xml + fi + fi + if [ -e /etc/skel/.config/compiz/compizconfig/Default.ini ]; then + sed -i 's/gnome-screenshot -i -w/ksnip/' /etc/skel/.config/compiz/compizconfig/Default.ini + sed -i 's/gnome-screenshot -i/ksnip/' /etc/skel/.config/compiz/compizconfig/Default.ini + if [ -e /var/lib/dpkg/info/xfce4-screenshooter.list ]; then + sed -i 's/ksnip/xfce4-screenshooter/' /etc/skel/.config/compiz/compizconfig/Default.ini + fi + fi # awesome in lightdm-menu if [ -e /usr/share/xsessions/awesome.desktop ]; then sed -i '/NoDisplay/d' /usr/share/xsessions/awesome.desktop diff --git a/config/chroot_local-hooks/03-ntfs3-override b/config/chroot_local-hooks/03-ntfs3-override new file mode 100755 index 0000000..2e7a3f9 --- /dev/null +++ b/config/chroot_local-hooks/03-ntfs3-override @@ -0,0 +1,10 @@ +#!/bin/sh + +for file in /root/config/*; do [ -r $file ] && . $file; done + +case "${LB_DISTRIBUTION}" in + +bookworm|trixie) + [ -e /sbin/mount.ntfs3 ] || ln -sfv $(readlink /sbin/mount.ntfs-3g) /sbin/mount.ntfs3 + ;; +esac diff --git a/config/chroot_local-hooks/03-towelfire-fixes b/config/chroot_local-hooks/03-towelfire-fixes index 29c4123..3ea8a0c 100755 --- a/config/chroot_local-hooks/03-towelfire-fixes +++ b/config/chroot_local-hooks/03-towelfire-fixes @@ -9,6 +9,12 @@ if [ -f /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/m sed -i 's/applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager,preferred:\/\/browser//' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml fi +# plasmamobile + +if [ -f /usr/share/plasma/look-and-feel/org.kde.breeze.mobile/contents/defaults ]; then + sed -i 's/Image=Next/Image=kanotix-spring/' /usr/share/plasma/look-and-feel/org.kde.breeze.mobile/contents/defaults +fi + # set flag as default in keyboard layout if [ -f /usr/share/plasma/plasmoids/org.kde.plasma.keyboardlayout/contents/config/main.xml ]; then sed -i 's/<default>0/<default>1/' /usr/share/plasma/plasmoids/org.kde.plasma.keyboardlayout/contents/config/main.xml diff --git a/config/chroot_local-hooks/hotfixes.sh b/config/chroot_local-hooks/hotfixes.sh index e437794..ea620dc 100755 --- a/config/chroot_local-hooks/hotfixes.sh +++ b/config/chroot_local-hooks/hotfixes.sh @@ -33,11 +33,6 @@ rm -rf /etc/sysconfig # rm/cp/mv aliases and bash completion for login shell cat <<EOT >> /etc/profile -# enable bash completion in interactive shells -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion -fi - # Some more alias to avoid making mistakes: alias rm='rm -i' alias cp='cp -i' diff --git a/config/chroot_local-hooks/xx-sources.list b/config/chroot_local-hooks/xx-sources.list index caf7cd6..a0597ee 100755 --- a/config/chroot_local-hooks/xx-sources.list +++ b/config/chroot_local-hooks/xx-sources.list @@ -23,28 +23,18 @@ case "${LB_DISTRIBUTION}" in stretch|buster|bullseye) exit ;; esac -# add signed-by to sources.list -# TODO dep822 -# TODO wine -# TODO fix it - -#sed -i 's/^deb-src/dummy/g' /etc/apt/sources.list +# Provide LB_DISTRIBUTION-updates Repo +# Fix as lb build with updates -#sed -i '/kanotix/s/^deb/deb [signed-by=\/usr\/share\/keyrings\/kanotix25.asc]/g' /etc/apt/sources.list -#sed -i '/debian.org/s/^deb/deb [signed-by=\/usr\/share\/keyrings\/debian-archive-keyring.gpg]/g' /etc/apt/sources.list -#sed -i '/dl.winehq/s/^deb/deb [signed-by=\/etc\/apt\/keyrings\/wine-staging.key.asc]/g' /etc/apt/sources.list +cat <<EOF >>/etc/apt/sources.list +# Debian ${LB_DISTRIBUTION}-proposed-updates +deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian ${LB_DISTRIBUTION}-updates main contrib non-free non-free-firmware +deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian ${LB_DISTRIBUTION}-updates main contrib non-free non-free-firmware +EOF -#sed -i 's/^dummy/deb-src/g' /etc/apt/sources.list -#sed -i '/kanotix/s/^deb-src/deb-src [signed-by=\/usr\/share\/keyrings\/kanotix25.asc]/g' /etc/apt/sources.list -#sed -i '/debian.org/s/^deb-src/deb-src [signed-by=\/usr\/share\/keyrings\/debian-archive-keyring.gpg]/g' /etc/apt/sources.list -#sed -i '/dl.winehq/s/^deb-src/deb-src [signed-by=\/etc\/apt\/keyrings\/wine-staging.key.asc]/g' /etc/apt/sources.list - -#if [ -e /etc/apt/trusted.gpg.d/wine-staging.key.asc ]; then -# cp -f /etc/apt/trusted.gpg.d/wine-staging.key.asc /etc/apt/keyrings/wine-staging.key.asc -#fi +# TODO dep822 # key.asc is kanotix spec -# debian keys needed by live-build ? +# debian keys needed by live-build ? no rm -f /etc/apt/trusted.gpg.d/*.key.asc -# test if we need debian-keys rm -f /etc/apt/trusted.gpg.d/* |