summaryrefslogtreecommitdiffstats
path: root/fedora-live-base.ks
diff options
context:
space:
mode:
authorBruno Wolff III <bruno@wolff.to>2011-03-30 23:00:32 -0500
committerBruno Wolff III <bruno@wolff.to>2011-03-30 23:00:32 -0500
commitd935d49b26109e2ba70b797de5407758224aa646 (patch)
treef6e1b1ba87b6343720a7a221e401b2a953d788b6 /fedora-live-base.ks
parentf97756babbccc68da1e46ff9ed77bf966d065ead (diff)
downloadspin-kickstarts-d935d49b26109e2ba70b797de5407758224aa646.tar.gz
spin-kickstarts-d935d49b26109e2ba70b797de5407758224aa646.tar.xz
spin-kickstarts-d935d49b26109e2ba70b797de5407758224aa646.zip
Prevent reseting the clock when shutting down.
With systemd the old method of preventing the hardware clock from getting reset no longer works and we need to do it a bit differently.
Diffstat (limited to 'fedora-live-base.ks')
-rw-r--r--fedora-live-base.ks6
1 files changed, 3 insertions, 3 deletions
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index f2d7766..a88834c 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -81,6 +81,9 @@ exists() {
touch /.liveimg-configured
+# Make sure we don't mangle the hardware clock on shutdown
+ln -sf /dev/null /etc/systemd/system/hwclock-save.service
+
# mount live image
if [ -b \`readlink -f /dev/live\` ]; then
mkdir -p /mnt/live
@@ -207,9 +210,6 @@ chkconfig --level 345 atd off 2>/dev/null || :
# 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
-
# and hack so that we eject the cd on shutdown if we're using a CD...
if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then
cat >> /sbin/halt.local << FOE