diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-08-15 17:47:47 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-08-15 17:47:47 +0000 |
| commit | 8d52c11433167022f744e17dc6b5083542555bd5 (patch) | |
| tree | 2836fca4baa92ead7bbce73c4cd08a7e2cb144b7 /packages/initscripts | |
| parent | 386adce3005914b529f615715a046e9efadec69d (diff) | |
| parent | f1312083bf2c572132431ffa6309a28b1e1b29de (diff) | |
merge of '976fd3ee118be06b85173fee9f4eaf90e321822d'
and 'a505ece6d3699f2da6fbe6590ac611befdcc5bdf'
Diffstat (limited to 'packages/initscripts')
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/bootmisc.sh | 7 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-1.0/save-rtc.sh | 17 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 4 |
3 files changed, 10 insertions, 18 deletions
diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh index 814dba676c..799cdca12b 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 stop +else + /etc/init.d/hwclock.sh start 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" |