rev 17204 - trunk/packages/kdebase-workspace/debian
Fathi Boudra
fabo at alioth.debian.org
Sun Feb 28 12:34:45 UTC 2010
Author: fabo
Date: 2010-02-28 12:34:43 +0000 (Sun, 28 Feb 2010)
New Revision: 17204
Modified:
trunk/packages/kdebase-workspace/debian/changelog
trunk/packages/kdebase-workspace/debian/kdm.init
Log:
Allow /etc/init.d/kdm status as non-root user.
Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog 2010-02-28 12:26:54 UTC (rev 17203)
+++ trunk/packages/kdebase-workspace/debian/changelog 2010-02-28 12:34:43 UTC (rev 17204)
@@ -89,6 +89,8 @@
- Polish (Marcin Owsiany). Closes: #571311
[ Fathi Boudra ]
+ * Allow /etc/init.d/kdm status as non-root user.
+ Thanks to Petter Reinholdtsen. (Closes: #527896).
* Use lsb output functions in kdm init script.
Thanks to Petter Reinholdtsen. (Closes: #567802).
Modified: trunk/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.init 2010-02-28 12:26:54 UTC (rev 17203)
+++ trunk/packages/kdebase-workspace/debian/kdm.init 2010-02-28 12:34:43 UTC (rev 17204)
@@ -35,6 +35,7 @@
PIDFILE=/var/run/kdm.pid
UPGRADEFILE=/var/run/kdm.upgrade
+setup_config () {
# parameters to support kdm customization
KDMRC=/etc/kde4/kdm/kdmrc
BACKGROUNDRC=/etc/kde4/kdm/backgroundrc
@@ -91,6 +92,7 @@
[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG
[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG
fi
+}
# If we upgraded the daemon, we can't use the --exec argument to
# start-stop-daemon since the inode will have changed. The risk here is that
@@ -116,6 +118,7 @@
case "$1" in
start)
+ setup_config
if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
[ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
[ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
More information about the pkg-kde-commits
mailing list