[Fedora-spins] [spin-kickstarts] Xfce: Fix language selection but change the timeout to 20 seconds; make the sed commands more rebust

[Christoph Wickert]

commit fa43ade19b821767fb3c51803866368863103bbf
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Nov 24 15:48:37 2012 +0100

    Xfce: Fix language selection but change the timeout to 20 seconds;
    make the sed commands more rebust against changes.

 fedora-livecd-xfce.ks |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 7302177..29a80f4 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -76,9 +76,9 @@ mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
 cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 
 # set up lightdm autologin
-sed -i 's/^#autologin-user=/autologin-user=liveuser/' /etc/lightdm/lightdm.conf 
-sed -i 's/^#autologin-user-timeout=0/autologin-user-timeout=30/' /etc/lightdm/lightdm.conf
-sed -i 's/^#show-language-selector=false/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=20/' /etc/lightdm/lightdm.conf
+sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
 
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop