rev 15531 - trunk/packages/kdebase-workspace/debian

[Modestas Vainius]

Author: modax-guest
Date: 2009-08-06 11:21:23 +0000 (Thu, 06 Aug 2009)
New Revision: 15531

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/kdm.init
Log:
reorder code in debian/kdm.init a bit. This should solve cases of kdm
failing to start. (NEEDS testing).

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-08-06 11:17:00 UTC (rev 15530)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-08-06 11:21:23 UTC (rev 15531)
@@ -3,8 +3,10 @@
   +++ Changes by Modestas Vainius:
 
   * debian/kdm.init: oxygen-air is new default now.
+  * reorder code in debian/kdm.init a bit. This should solve cases of kdm
+    failing to start.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Aug 2009 12:17:44 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 06 Aug 2009 14:20:53 +0300
 
 kdebase-workspace (4:4.3.0-1) unstable; urgency=low
 

Modified: trunk/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.init	2009-08-06 11:17:00 UTC (rev 15530)
+++ trunk/packages/kdebase-workspace/debian/kdm.init	2009-08-06 11:21:23 UTC (rev 15531)
@@ -40,13 +40,13 @@
 BACKGROUNDRC=/etc/kde4/kdm/backgroundrc
 
 #if configuration is changed by kdmtheme or other tools, don't do magick
-if grep -q "^[[:space:]]*Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "^[[:space:]]*Wallpaper=default_blue.jpg" ${BACKGROUNDRC}
-then
+if grep -q "^[[:space:]]*Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC}; then
 
 	KDMOVERRIDEDIR=/etc/default/kdm.d
 	KDMCFGDIR=/var/run/kdm
 	KDMCFG=$KDMCFGDIR/kdmrc
 	BACKGROUNDCFG=$KDMCFGDIR/backgroundrc
+    DEFAULT_KDM_THEME=/usr/share/kde4/apps/kdm/themes/oxygen-air
 
 	test -x $DAEMON || exit 0
 
@@ -60,37 +60,37 @@
 	# we use an alternative kdm master configuration file
 	ARG="$ARG -config $KDMCFG"
 
-	# we source overrides. run-parts sorts the list in a predictable order
-	if [ -d "$KDMOVERRIDEDIR" ]; then
-		for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do
-			. "$part"
-		done
-	fi
-
 	# we generate kdm configuration files
 	genkdmconf --in $KDMCFGDIR 1> /dev/null
 
-	# we update kdm configuration files (only overridden values)
-	[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG
-	[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG
-	[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG
-	[ -n "$THEME" ] && [ -e "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
-	[ -n "$WALLPAPER" ] && [ -e "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
+    if grep -q "^[[:space:]]*Wallpaper=default_blue.jpg" ${BACKGROUNDRC}; then
+        # we source overrides. run-parts sorts the list in a predictable order
+        if [ -d "$KDMOVERRIDEDIR" ]; then
+            for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do
+                . "$part"
+            done
+        fi
 
+        # we update kdm configuration files (only overridden values)
+        [ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG
+        [ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG
+        [ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG
+        [ -n "$THEME" ] && [ -e "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
+        [ -n "$WALLPAPER" ] && [ -e "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
+    fi
+
+    #usetheme is now on "by default" so we need to be sure Theme is not invalid ...
+    sed -i "s|@@@ToBeReplacedByDesktopBase@@@|$DEFAULT_KDM_THEME|" ${KDMCFG}
+
+    # autologin overrides are useful for live debian environment
+    if [ -n "$AUTOLOGINUSER" ]; then
+        sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG
+        sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG
+    fi
+    [ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG
+    [ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG
+    [ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG
 fi
-#usetheme is now on "by default" so we need to be sure that there is something ...
-if grep -q "^[[:space:]]*Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC}
-then
-	sed -i 's|@@@ToBeReplacedByDesktopBase@@@|/usr/share/kde4/apps/kdm/themes/oxygen-air|' ${KDMCFG}
-fi
-# autologin overrides are useful for live debian environment
-if [ -n "$AUTOLOGINUSER" ]; then
-	sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG
-	sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG
-fi
-[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG
-[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG
-[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG
 
 # 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