[SCM] debian-live/live-initramfs branch, master, updated. 1.124.1-1-3-gf8ebd28
Daniel Baumann
daniel at debian.org
Tue Mar 25 08:24:20 UTC 2008
The following commit has been merged in the master branch:
commit f8ebd28c51c972f3235fff52c9111d40de041dff
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Mar 25 09:24:27 2008 +0100
Merging casper 1.125.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index efa0f44..1c61861 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,15 @@
+casper (1.125) hardy; urgency=low
+
+ [ Colin Watson ]
+ * Stop quoting Exec arguments in .desktop files. Apparently this used to
+ work but now the system conforms more strictly to the desktop entry
+ specification (LP: #204185).
+
+ [ Jonathan Riddell ]
+ * scripts/casper-bottom/15autologin: Enable auto-login for KDM-KDE4
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 20 Mar 2008 10:20:17 +0000
+
casper (1.124) hardy; urgency=low
[ Colin Watson ]
diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 10cae2d..2c880b7 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -71,6 +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 ]
+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
fi
log_end_msg
diff --git a/scripts/live-bottom/35fix_language_selector b/scripts/live-bottom/35fix_language_selector
index 126a5b2..70495c4 100755
--- a/scripts/live-bottom/35fix_language_selector
+++ b/scripts/live-bottom/35fix_language_selector
@@ -33,7 +33,7 @@ log_begin_msg "Fixing language selector..."
if [ -e /root/usr/share/applications/language-selector.desktop ]
then
- sed -i '/^Exec/ s|/usr/bin/gnome-language-selector|"& -n"|' /root/usr/share/applications/language-selector.desktop
+ sed -i '/^Exec/ s|/usr/bin/gnome-language-selector|& -n|' /root/usr/share/applications/language-selector.desktop
fi
if [ -x /root/usr/bin/fontconfig-voodoo ]
--
debian-live/live-initramfs
More information about the debian-live-changes
mailing list