[oe-commits] Andreas Oberritter : initscripts: test whether /etc/init.d/hwclock. sh exists

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 9c8300f030b69652ad39e1bc2979f5d9a03adf1e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9c8300f030b69652ad39e1bc2979f5d9a03adf1e

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Tue Mar 13 20:14:40 2012 +0100

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 at opendreambox.org>

---

 .../initscripts/initscripts-1.0/bootmisc.sh        |    4 ++--
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
 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 5b86e79..4f76cb4 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 f3dc852..829694b 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"