fedora-livecd-lxde.ks | 7 ++-----
fedora-livecd-security.ks | 23 ++++++++++-------------
2 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit ad6311931264f48ed10ee52802ebd96f8a33597f
Author: Christoph Wickert <fedora(a)christoph-wickert.de>
Date: Tue Mar 23 19:42:50 2010 +0100
Security: Sync LXDE and LXDM configuration with LXDE spin
diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks
index d5a63ff..9a9213c 100644
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -170,30 +170,26 @@ PolicyKit-gnome
%end
%post
-
-# set up auto-login for liveuser
-cat >> /etc/slim.conf << FOE
-auto_login yes
-default_user liveuser
-FOE
+# LXDE and LXDM configuration
# create /etc/sysconfig/desktop (needed for installation)
-cat >> /etc/sysconfig/desktop <<EOF
+cat > /etc/sysconfig/desktop <<EOF
PREFERRED=/usr/bin/startlxde
-DISPLAYMANAGER=/usr/bin/slim-dynwm
+DISPLAYMANAGER=/usr/sbin/lxdm
EOF
cat >> /etc/rc.d/init.d/livesys << EOF
# disable screensaver locking and make sure gamin gets started
-rm -f /etc/xdg/lxsession/LXDE/autostart
-cat >> /etc/xdg/lxsession/LXDE/autostart << FOE
+cat > /etc/xdg/lxsession/LXDE/autostart << FOE
/usr/libexec/gam_server
-@lxde-settings-daemon
-@pulseaudio -D
@lxpanel --profile LXDE
@pcmanfm -d
+@pulseaudio -D
FOE
+# set up auto-login for liveuser
+sed -i 's|# autologin=dgod|autologin=liveuser|g' /etc/lxdm/lxdm.conf
+
# Show harddisk install on the desktop
sed -i -e 's/NoDisplay=true/NoDisplay=false/'
/usr/share/applications/liveinst.desktop
mkdir /home/liveuser/Desktop
@@ -202,9 +198,10 @@ cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
# Add autostart for parcellite
cp /usr/share/applications/fedora-parcellite.desktop /etc/xdg/autostart
-#last thing to do
+# this goes at the end after all other changes.
chown -R liveuser:liveuser /home/liveuser
restorecon -R /home/liveuser
+
EOF
%end
commit 8ca163d935c1be7e1d72c2110993aa5fd83e1089
Author: Christoph Wickert <fedora(a)christoph-wickert.de>
Date: Tue Mar 23 19:41:51 2010 +0100
LXDE: fix LXDM autologin
diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks
index 708b12f..8b0058a 100644
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
@@ -108,10 +108,9 @@ ssmtp
%end
%post
-# LXDE and SLiM configuration
+# LXDE and LXDM configuration
# create /etc/sysconfig/desktop (needed for installation)
-
cat > /etc/sysconfig/desktop <<EOF
PREFERRED=/usr/bin/startlxde
DISPLAYMANAGER=/usr/sbin/lxdm
@@ -134,9 +133,7 @@ MailClient=redhat-sylpheed.desktop
FOE
# set up auto-login for liveuser
-cat >> /etc/lxdm/lxdm.conf << FOE
-autologin=liveuser
-FOE
+sed -i 's|# autologin=dgod|autologin=liveuser|g' /etc/lxdm/lxdm.conf
# Show harddisk install on the desktop
sed -i -e 's/NoDisplay=true/NoDisplay=false/'
/usr/share/applications/liveinst.desktop
Show replies by date