From 0b71565dfb4f9e8db2c3482811acc98a63487d68 Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Sat, 19 Mar 2011 04:03:55 +0100 Subject: added trinity live-config-hacks for sudo and kdm --- .../lib/live/config/003-sudo-trinity | 65 ++++++++++++++++++++++ .../lib/live/config/008-kdm-trinity | 61 ++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100755 config/chroot_local-includes/lib/live/config/003-sudo-trinity create mode 100755 config/chroot_local-includes/lib/live/config/008-kdm-trinity diff --git a/config/chroot_local-includes/lib/live/config/003-sudo-trinity b/config/chroot_local-includes/lib/live/config/003-sudo-trinity new file mode 100755 index 0000000..bfb39e5 --- /dev/null +++ b/config/chroot_local-includes/lib/live/config/003-sudo-trinity @@ -0,0 +1,65 @@ +#!/bin/sh + +## live-config(7) - System Configuration Scripts +## Copyright (C) 2006-2011 Daniel Baumann +## +## live-config 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. + + +Sudo () +{ + # Checking if package is installed or already configured + if [ ! -e /var/lib/dpkg/info/sudo-trinity.list ] || \ + [ -e /var/lib/live/config/sudo ] + then + return + fi + + echo -n " sudo" + + Configure_sudo +} + +Configure_sudo () +{ + # Checking if if package is already configured differently + if grep -q "^${LIVE_USERNAME}" /etc/sudoers + then + return + fi + + echo "${LIVE_USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + + sudo -u "${LIVE_USERNAME}" sh -c "echo 'SU_TO_ROOT_SU=sudo' >> /home/${LIVE_USERNAME}/.su-to-rootrc" + + if [ -x /usr/bin/gconftool-2 ] + then + sudo -u "${LIVE_USERNAME}" gconftool-2 -s -t bool /apps/gksu/sudo-mode true + sudo -u "${LIVE_USERNAME}" gconftool-2 -s -t bool /apps/gksu/display-no-pass-info false + fi + + # trinity /etc/skel kdesu override hack + rm -f /home/${LIVE_USERNAME}/.trinity/share/config/kdesurc + + sudo -u "${LIVE_USERNAME}" sh -c "umask 0077 && mkdir -p /home/${LIVE_USERNAME}/.kde/share/config && cat > /home/${LIVE_USERNAME}/.kde/share/config/kdesurc" << EOF +[super-user-command] +super-user-command=sudo +EOF + + if [ -e /usr/share/apps/konsole/sumc.desktop ] + then + sudo -u "${LIVE_USERNAME}" sh -c "umask 0077 && mkdir -p /home/${LIVE_USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo mc -c/' /usr/share/apps/konsole/sumc.desktop > /home/${LIVE_USERNAME}/.kde/share/apps/konsole/sumc.desktop" + fi + + if [ -e /usr/share/apps/konsole/su.desktop ] + then + sudo -u "${LIVE_USERNAME}" sh -c "umask 0077 && mkdir -p /home/${LIVE_USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo -i/' /usr/share/apps/konsole/su.desktop > /home/${LIVE_USERNAME}/.kde/share/apps/konsole/su.desktop" + fi + + # Creating state file + touch /var/lib/live/config/sudo +} + +Sudo diff --git a/config/chroot_local-includes/lib/live/config/008-kdm-trinity b/config/chroot_local-includes/lib/live/config/008-kdm-trinity new file mode 100755 index 0000000..a924fe7 --- /dev/null +++ b/config/chroot_local-includes/lib/live/config/008-kdm-trinity @@ -0,0 +1,61 @@ +#!/bin/sh + +## live-config(7) - System Configuration Scripts +## Copyright (C) 2006-2011 Daniel Baumann +## +## live-config 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. + + +Kdm () +{ + # Checking if package is installed or already configured + if [ ! -e /var/lib/dpkg/info/kdm-trinity.list ] + then + return + fi + + if [ -e /var/lib/live/config/kdm ] + then + # Avoid xinit + _X11="true" + export _X11 + + return + fi + + echo -n " kdm" + + Configure_kdm +} + +Configure_kdm () +{ + if [ -e /etc/trinity/kdm/kdmrc ] + then + # trinity + + # autologin + sed -i -r -e "s|^#?AutoLoginEnable=.*\$|AutoLoginEnable=true|" \ + -e "s|^#?AutoLoginAgain=.*\$|AutoLoginAgain=true|" \ + -e "s|^#?AutoLoginUser=.*\$|AutoLoginUser=${LIVE_USERNAME}|" \ + /etc/trinity/kdm/kdmrc + + # language + if [ -n "${_LANGUAGE}" ] + then + sed -i -r -e "s|^#?Language=.*\$|Language=${_LANGUAGE}|" \ + /etc/trinity/kdm/kdmrc + fi + fi + + # Avoid xinit + _X11="true" + export _X11 + + # Creating state file + touch /var/lib/live/config/kdm +} + +Kdm -- cgit v1.0