aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initscripts
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-13 20:14:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 23:16:05 +0000
commit9c8300f030b69652ad39e1bc2979f5d9a03adf1e (patch)
tree8517192fc67ce638ca0d0860d75068345dfa79f4 /meta/recipes-core/initscripts
parentd3657fbd3e6cdfa0cfd355de446b474fb2f72e81 (diff)
downloadopenembedded-core-contrib-9c8300f030b69652ad39e1bc2979f5d9a03adf1e.tar.gz
openembedded-core-contrib-9c8300f030b69652ad39e1bc2979f5d9a03adf1e.tar.bz2
openembedded-core-contrib-9c8300f030b69652ad39e1bc2979f5d9a03adf1e.zip
initscripts: test whether /etc/init.d/hwclock.sh exists
* bootmisc.sh executes /etc/init.d/hwclock.sh, which is optional (depends on CONFIG_HWCLOCK in busybox). Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/recipes-core/initscripts')
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh4
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 5b86e798b6e..4f76cb4b288 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -65,14 +65,14 @@ fi
# Set the system clock from hardware clock
# If the timestamp is more recent than the current time,
# use the timestamp instead.
-/etc/init.d/hwclock.sh start
+test -x /etc/init.d/hwclock.sh && /etc/init.d/hwclock.sh start
if test -e /etc/timestamp
then
SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
read TIMESTAMP < /etc/timestamp
if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
date -u ${TIMESTAMP#????}${TIMESTAMP%????????}
- /etc/init.d/hwclock.sh stop
+ test -x /etc/init.d/hwclock.sh && /etc/init.d/hwclock.sh stop
fi
fi
: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index f3dc8526245..829694b462e 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 = "r133"
+PR = "r134"
INHIBIT_DEFAULT_DEPS = "1"