[Fedora-livecd-list] 2 commits - config/livecd-fedora-base-desktop.ks config/livecd-fedora-desktop.ks config/livecd-fedora-kde.ks

[Jeremy Katz]

 config/livecd-fedora-base-desktop.ks |    7 +++++++
 config/livecd-fedora-desktop.ks      |    4 ----
 config/livecd-fedora-kde.ks          |    5 -----
 3 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 6499898db35cfcb02399deb82e4e1ca8163d4553
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Oct 9 11:27:30 2007 -0400

    workaround to keep teh clock from getting synced on shutdown when
    running live (#297421)

diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 4b5b266..367ddc6 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -124,6 +124,9 @@ chkconfig --level 345 readahead_later off
 
 # Stopgap fix for RH #217966; should be fixed in HAL instead
 touch /media/.hal-mtab
+
+# workaround clock syncing on shutdown that we don't want (#297421)
+sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt
 EOF
 
 # workaround avahi segfault (#279301)
commit 9628e9d2ac97b50ea8536b71ed9175831e130fb4
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Oct 9 11:25:01 2007 -0400

    put avahi bug workaround (#279301) in the base desktop config

diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index a166e41..4b5b266 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -126,6 +126,10 @@ chkconfig --level 345 readahead_later off
 touch /media/.hal-mtab
 EOF
 
+# workaround avahi segfault (#279301)
+touch /etc/resolv.conf
+/sbin/restorecon /etc/resolv.conf
+
 chmod 755 /etc/rc.d/init.d/fedora-live
 /sbin/restorecon /etc/rc.d/init.d/fedora-live
 /sbin/chkconfig --add fedora-live
diff --git a/config/livecd-fedora-desktop.ks b/config/livecd-fedora-desktop.ks
index 549e27b..89115b0 100644
--- a/config/livecd-fedora-desktop.ks
+++ b/config/livecd-fedora-desktop.ks
@@ -120,10 +120,6 @@ gnome-blog
 %end
 
 %post
-# workaround avahi segfault (#279301)
-touch /etc/resolv.conf
-/sbin/restorecon /etc/resolv.conf
-
 cat >> /etc/rc.d/init.d/fedora-live << EOF
 # disable screensaver locking
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
diff --git a/config/livecd-fedora-kde.ks b/config/livecd-fedora-kde.ks
index 2373cd8..24c83f4 100644
--- a/config/livecd-fedora-kde.ks
+++ b/config/livecd-fedora-kde.ks
@@ -66,11 +66,6 @@ python-reportlab
 %end
 
 %post
-# workaround avahi segfault (#279301)
-touch /etc/resolv.conf
-/sbin/restorecon /etc/resolv.conf
-
-
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 DESKTOP="KDE"