From e80d0ca6b67dfed845cb8e21d942c3452dfe76f1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 19 Aug 2008 20:02:31 +0000
Subject: initscripts: Remove pointless forks from timestamp code

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5079 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/initscripts/initscripts-1.0/bootmisc.sh | 10 +++++-----
 meta/packages/initscripts/initscripts-1.0/save-rtc.sh |  2 +-
 meta/packages/initscripts/initscripts_1.0.bb          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/initscripts/initscripts-1.0/bootmisc.sh b/meta/packages/initscripts/initscripts-1.0/bootmisc.sh
index deced6aadf..bd11f9a2fc 100755
--- a/meta/packages/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/packages/initscripts/initscripts-1.0/bootmisc.sh
@@ -65,13 +65,13 @@ fi
 # If the timestamp is 1 day or more recent than the current time,
 # use the timestamp instead.
 /etc/init.d/hwclock.sh start
-if test -e /etc/timestamp
+if test -e /etc/timestamp2
 then
-	SYSTEMDATE=`date "+%Y%m%d"`
-	TIMESTAMP=`cat /etc/timestamp | awk '{ print substr($0,9,4) substr($0,1,4);}'`
-        NEEDUPDATE=`expr \( $TIMESTAMP \> $SYSTEMDATE \)`                                                 
+	SYSTEMDATE=`date "+%Y%m%d%2H%2M"`
+	read TIMESTAMP < /etc/timestamp2
+        NEEDUPDATE=`expr \( $TIMESTAMP \> $SYSTEMDATE + 10000 \)`
         if [ $NEEDUPDATE -eq 1 ]; then 
-		date `cat /etc/timestamp`
+		date $TIMESTAMP
 		/etc/init.d/hwclock.sh stop
 	fi
 fi
diff --git a/meta/packages/initscripts/initscripts-1.0/save-rtc.sh b/meta/packages/initscripts/initscripts-1.0/save-rtc.sh
index bf1737f506..75e43001b8 100644
--- a/meta/packages/initscripts/initscripts-1.0/save-rtc.sh
+++ b/meta/packages/initscripts/initscripts-1.0/save-rtc.sh
@@ -10,4 +10,4 @@
 ### END INIT INFO
 
 # Update the timestamp
-date +%2m%2d%2H%2M%Y > /etc/timestamp
+date +%Y%m%d%2H%2M > /etc/timestamp2
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 377cc14102..2a0f60dd15 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r117"
+PR = "r118"
 
 SRC_URI = "file://functions \
            file://halt \
-- 
cgit v1.2.3-54-g00ecf