diff options
| author | Gary Thomas <gary@mlbassoc.com> | 2012-02-10 09:16:05 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-23 23:59:14 +0000 |
| commit | 5aab6653c9afa05e7c1b3ccd6bd34aec05c2a6f8 (patch) | |
| tree | 55628b37f7426f9a50719e19eb21034f1ff4bd89 | |
| parent | a101bc85adcc915f151348107e850b8998a395b0 (diff) | |
| download | openembedded-core-5aab6653c9afa05e7c1b3ccd6bd34aec05c2a6f8.tar.gz openembedded-core-5aab6653c9afa05e7c1b3ccd6bd34aec05c2a6f8.tar.bz2 openembedded-core-5aab6653c9afa05e7c1b3ccd6bd34aec05c2a6f8.tar.xz openembedded-core-5aab6653c9afa05e7c1b3ccd6bd34aec05c2a6f8.zip | |
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 <gary@mlbassoc.com>
| -rwxr-xr-x | meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 4 | ||||
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh | 2 | ||||
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index d9e8ffa37..20ec0a025 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 3d8e8507e..1f804e237 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 diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 203c60548..b56c55c8a 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r129" +PR = "r130" INHIBIT_DEFAULT_DEPS = "1" |