summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2013-02-13 15:37:36 +0000
committerMatthias Clasen <mclasen@redhat.com>2013-02-13 14:34:02 -0500
commit254dfaeee6113fe6cb8f2bde3bbdfc86ecdba343 (patch)
treea8f5319d18fae328f9d7df1e9e2a17a0d2d87343
parent85123ce36524f8731a568bb56928c539b5633769 (diff)
downloadspin-kickstarts-254dfaeee6113fe6cb8f2bde3bbdfc86ecdba343.tar.gz
spin-kickstarts-254dfaeee6113fe6cb8f2bde3bbdfc86ecdba343.tar.xz
spin-kickstarts-254dfaeee6113fe6cb8f2bde3bbdfc86ecdba343.zip
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.
-rw-r--r--fedora-live-base.ks3
-rw-r--r--fedora-live-desktop.ks2
-rw-r--r--fedora-live-mini.ks3
-rw-r--r--fedora-livecd-soas.ks2
-rw-r--r--fedora-livedvd-robotics.ks2
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