diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-07-03 03:24:05 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-03 03:24:05 +0000 |
| commit | 0634f7bc2185bf1c2caac4eee98473af8b569048 (patch) | |
| tree | fa5ae34f4d9734a312754be926a48d3b0218a4a3 /packages/initscripts | |
| parent | 602af584cc98ccfa10ca30cd850ec0ac92fe8ac0 (diff) | |
initscripts: Store RTC in /etc/timestamp before mounting root ro, fixing part of OE bug #1055
Diffstat (limited to 'packages/initscripts')
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/halt | 6 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/reboot | 6 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-1.0/save-rtc.sh | 16 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 8 |
4 files changed, 22 insertions, 14 deletions
diff --git a/packages/initscripts/initscripts-1.0/halt b/packages/initscripts/initscripts-1.0/halt index aa1769606a..d8cab222ca 100755 --- a/packages/initscripts/initscripts-1.0/halt +++ b/packages/initscripts/initscripts-1.0/halt @@ -7,12 +7,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -# Update the timestamp, if there is already one -if test -e /etc/timestamp -then - date +%2m%2d%2H%2M%Y > /etc/timestamp -fi - # See if we need to cut the power. if test -x /etc/init.d/ups-monitor then diff --git a/packages/initscripts/initscripts-1.0/reboot b/packages/initscripts/initscripts-1.0/reboot index 7f95255bd9..56278199be 100755 --- a/packages/initscripts/initscripts-1.0/reboot +++ b/packages/initscripts/initscripts-1.0/reboot @@ -7,11 +7,5 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -# Update the timestamp, if there is one -if test -e /etc/timestamp -then - date +%2m%2d%2H%2M%Y > /etc/timestamp -fi - echo -n "Rebooting... " reboot -d -f -i diff --git a/packages/initscripts/initscripts-1.0/save-rtc.sh b/packages/initscripts/initscripts-1.0/save-rtc.sh new file mode 100644 index 0000000000..d06aa6d569 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/save-rtc.sh @@ -0,0 +1,16 @@ +#! /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 diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index eebfbca7bf..0d14403a36 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r73" +PR = "r74" SRC_URI = "file://halt \ file://ramdisk \ @@ -31,7 +31,8 @@ SRC_URI = "file://halt \ file://sysfs.sh \ file://device_table.txt \ file://populate-volatile.sh \ - file://volatiles " + file://volatiles \ + file://save-rtc.sh" SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" @@ -82,6 +83,7 @@ do_install () { install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d @@ -119,6 +121,8 @@ do_install () { ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc0.d/S25save-rtc.sh + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc6.d/S25save-rtc.sh ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh # ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh |