From: Daniel Baumann <daniel@debian.org>
Date: Tue, 5 Aug 2008 21:45:32 +0000 (+0200)
Subject: Merging casper 1.137.
X-Git-Tag: debian/2.0.15-1~492
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=96db9eaff01b09f16ad2a22d7d84a344ef8a9723;p=live-boot-grml.git

Merging casper 1.137.
---

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 564e69b..cb17c2e 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.137) intrepid; urgency=low
+
+  * Update scripts/casper-bottom/15autologin for KDM from KDE 4.
+  * Update 32disable_hibernation for KDE 4.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 17 Jul 2008 13:41:38 +0100
+
 casper (1.136) intrepid; urgency=low
 
   * Remove bad-and-wrong setting of PATH to include directories under /root;
diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 2c880b7..4b203d7 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -71,13 +71,13 @@ then
 		  -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=${USERNAME}/" \
 		  -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
 	/root/etc/kde3/kdm/kdmrc
-elif [ -f /root/usr/lib/kde4/etc/kde4/kdm/kdmrc ]
+elif [ -f /root/etc/kde4/kdm/kdmrc ]
 then
 	# Configure KDM-KDE4 autologin
 	sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
 		  -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
 		  -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
-	/root/usr/lib/kde4/etc/kde4/kdm/kdmrc
+	/root/etc/kde4/kdm/kdmrc
 fi
 
 log_end_msg