From 254dfaeee6113fe6cb8f2bde3bbdfc86ecdba343 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 13 Feb 2013 15:37:36 +0000
Subject: [PATCH] Fix GDM auto-login for all GNOME-based spins

Using >> means we have a custom.conf file that looks like this:

[daemon]
...
[daemon]
AutomaticLoginEnable=True
AutomaticLogin=liveuser

Which is the first reason why it's failing. Change the cat append to replace as
the other sections are optional.

Additionally, the livesys legacy service is not completing before gdm is being
started, which means the config file is being read before it has been altered.

This can be fixed by adding a LSB-style "X-Start-Before: display-manager" in the
header of livesys.
---
 fedora-live-base.ks        | 3 +++
 fedora-live-desktop.ks     | 2 +-
 fedora-live-mini.ks        | 3 +++
 fedora-livecd-soas.ks      | 2 +-
 fedora-livedvd-robotics.ks | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index ecbc9b5..503a624 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -63,6 +63,9 @@ cat > /etc/rc.d/init.d/livesys << EOF
 #
 # chkconfig: 345 00 99
 # description: Init script for live image.
+### BEGIN INIT INFO
+# X-Start-Before: display-manager
+### END INIT INFO
 
 . /etc/init.d/functions
 
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index c3f5187..0690680 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -55,7 +55,7 @@ fi
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
 # set up auto-login
-cat >> /etc/gdm/custom.conf << FOE
+cat > /etc/gdm/custom.conf << FOE
 [daemon]
 AutomaticLoginEnable=True
 AutomaticLogin=liveuser
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index 90a50b6..8a524a6 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -107,6 +107,9 @@ cat > /etc/rc.d/init.d/livesys << EOF
 #
 # chkconfig: 345 00 99
 # description: Init script for live image.
+### BEGIN INIT INFO
+# X-Start-Before: display-manager
+### END INIT INFO
 
 . /etc/init.d/functions
 
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index cf87f55..5938bd9 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -67,7 +67,7 @@ vu.lux.olpc.Speak
 EOF
 
 # set up auto-login
-cat >> /etc/gdm/custom.conf << EOF
+cat > /etc/gdm/custom.conf << EOF
 [daemon]
 AutomaticLoginEnable=True
 AutomaticLogin=liveuser
diff --git a/fedora-livedvd-robotics.ks b/fedora-livedvd-robotics.ks
index 9b4a0b0..c903e5a 100644
--- a/fedora-livedvd-robotics.ks
+++ b/fedora-livedvd-robotics.ks
@@ -127,7 +127,7 @@ fi
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
 # set up auto-login
-cat >> /etc/gdm/custom.conf << FOE
+cat > /etc/gdm/custom.conf << FOE
 [daemon]
 AutomaticLoginEnable=True
 AutomaticLogin=liveuser