[Fedora-spins] [spin-kickstarts: 1/2] SoaS: further live image startup fixes

[Peter Robinson]

commit 776275a4e262fa5b3bc68b903e2a34841ee3b799
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Jun 12 12:11:59 2011 +0100

    SoaS: further live image startup fixes

 fedora-live-mini.ks   |    4 ++--
 fedora-livecd-soas.ks |    7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index 9678b90..1878cf9 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -329,8 +329,6 @@ exists() {
     \$*
 }
 
-touch /.liveimg-late-configured
-
 # read some variables out of /proc/cmdline
 for o in \`cat /proc/cmdline\` ; do
     case \$o in
@@ -363,6 +361,8 @@ EndSection
 FOE
 fi
 
+touch /.liveimg-late-configured
+
 EOF
 
 chmod 755 /etc/rc.d/init.d/livesys
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 487e21d..5ec0104 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -90,7 +90,7 @@ Sugar on a Stick 5 (Coconut)
 Fedora release 15 (Lovelock)
 EOF
 
-cat >> /etc/rc.d/init.d/livesys << EOF
+cat >> /etc/rc.d/init.d/livesys-late << EOF
 
 # run lokkit as firewall command doesn't seem to work
 lokkit --enabled --service=mdns
@@ -133,6 +133,7 @@ mtime=1302886515
 lock-on-idle=false
 lock-timeout=0
 FOE
+
 chown -R liveuser:liveuser /home/liveuser/.gnome2/keyrings
 fi
 
@@ -167,4 +168,8 @@ FOE
 
 EOF
 
+chmod 755 /etc/rc.d/init.d/livesys-late
+/sbin/restorecon /etc/rc.d/init.d/livesys-late
+/sbin/chkconfig --add livesys-late
+
 %end