From b83af04c15fa7e91faa3ecd2297937077c14a620 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 14 Aug 2007 18:13:17 +0000
Subject: initscripts: first steps towards working together with RTC TODO:
 might need more work for systems without a hardware clock

---
 packages/initscripts/initscripts-1.0/bootmisc.sh |  7 ++++++-
 packages/initscripts/initscripts-1.0/save-rtc.sh | 17 ++---------------
 packages/initscripts/initscripts_1.0.bb          |  4 ++--
 3 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'packages/initscripts')

diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh
index 814dba676c..1c817fab5e 100755
--- a/packages/initscripts/initscripts-1.0/bootmisc.sh
+++ b/packages/initscripts/initscripts-1.0/bootmisc.sh
@@ -62,10 +62,15 @@ fi
 /sbin/ldconfig
 
 # 
-# Recover the time, if there is a time file                 
+# Recover the time, if there is a time file (first boot only)
+# If not, set system clock from hardware clock
 #
 if test -e /etc/timestamp
 then
 	date -s `cat /etc/timestamp`
+	mv -f /etc/timestamp /etc/timestamp.done
+	/etc/init.d/hwclock.sh start
+else
+	/etc/init.d/hwclock.sh stop
 fi
 : exit 0
diff --git a/packages/initscripts/initscripts-1.0/save-rtc.sh b/packages/initscripts/initscripts-1.0/save-rtc.sh
index d06aa6d569..de7c2b7646 100644
--- a/packages/initscripts/initscripts-1.0/save-rtc.sh
+++ b/packages/initscripts/initscripts-1.0/save-rtc.sh
@@ -1,16 +1,3 @@
 #! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: save-rtc.sh
-# Date: 03-Jul-06
-
-
-# Update the timestamp, if there is already one
-if test -e /etc/timestamp
-then
-	echo "Will restore RCT from /etc/timestamp on next boot"
-	echo "Delete that file to disable this feature."
-        date +%2m%2d%2H%2M%Y > /etc/timestamp
-fi
+#FIXME readd timestamp handling for systems where RTC doesn't survive a reboot
+/etc/init.d/hwclock stop
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 39b1eee9c1..aa30833895 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r96"
+PR = "r97"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -30,7 +30,7 @@ SRC_URI = "file://halt \
            file://device_table.txt \
            file://populate-volatile.sh \
            file://volatiles \
-	   file://save-rtc.sh"
+           file://save-rtc.sh"
 
 SRC_URI_append_arm          = " file://alignment.sh"
 
-- 
cgit v1.2.3


From 51d03d2fe5715230873099c85d8a99707ec3f80d Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 14 Aug 2007 23:02:39 +0000
Subject: initscripts/bootmisc.sh: fix upsidedown logic w/ hwclock.sh

---
 packages/initscripts/initscripts-1.0/bootmisc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/initscripts')

diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh
index 1c817fab5e..799cdca12b 100755
--- a/packages/initscripts/initscripts-1.0/bootmisc.sh
+++ b/packages/initscripts/initscripts-1.0/bootmisc.sh
@@ -69,8 +69,8 @@ if test -e /etc/timestamp
 then
 	date -s `cat /etc/timestamp`
 	mv -f /etc/timestamp /etc/timestamp.done
-	/etc/init.d/hwclock.sh start
-else
 	/etc/init.d/hwclock.sh stop
+else
+	/etc/init.d/hwclock.sh start
 fi
 : exit 0
-- 
cgit v1.2.3