From 5aab6653c9afa05e7c1b3ccd6bd34aec05c2a6f8 Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Fri, 10 Feb 2012 09:16:05 -0700 Subject: initscripts: Make /etc/timestamp consistent again. Commit cc8695 changed the way timestamps were handled and added some extra munging to be able to compare them reliably. This change makes the timestamp value the same everywhere and simplifies how the check to set the system clock based on the timestamp is done. Also, if the value stored in /etc/timestamp is newer [at all] than the current system time, set the system clock from the stored value, down to the minute, not just the day. Signed-off-by: Gary Thomas --- meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 4 ++-- meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/initscripts/initscripts-1.0') diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index d9e8ffa373..20ec0a025d 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh @@ -68,9 +68,9 @@ fi /etc/init.d/hwclock.sh start if test -e /etc/timestamp then - SYSTEMDATE=`date -u +%4Y%2m%2d` + SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M` read TIMESTAMP < /etc/timestamp - if [ ${TIMESTAMP#????????}${TIMESTAMP%????????} -gt $SYSTEMDATE ]; then + if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then date -u $TIMESTAMP /etc/init.d/hwclock.sh stop fi diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh index 3d8e8507e7..1f804e2374 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh @@ -10,4 +10,4 @@ ### END INIT INFO # Update the timestamp -date -u +%2m%2d%2H%2M%4Y > /etc/timestamp +date -u +%4Y%2m%2d%2H%2M > /etc/timestamp -- cgit 1.2.3-korg