diff options
| author | Ben Shelton <ben.shelton@ni.com> | 2014-07-23 11:22:44 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-23 21:49:46 +0100 |
| commit | c8a451adc71e4ce9ab963f61d7830c2d75aaffca (patch) | |
| tree | ce80eb9bf5ba992d97a3d41c3006d3fcc0af5bd3 | |
| parent | f4d288881d7b1b2390a0f1234724fdd5d7a84b57 (diff) | |
| download | openembedded-core-c8a451adc71e4ce9ab963f61d7830c2d75aaffca.tar.gz openembedded-core-c8a451adc71e4ce9ab963f61d7830c2d75aaffca.tar.bz2 openembedded-core-c8a451adc71e4ce9ab963f61d7830c2d75aaffca.zip | |
initscripts: fix bashism in bootmisc.sh
In the commit 'initscripts: save /etc/timestamp with seconds accuracy',
a bashism was introduced in the bootmisc.sh script in the code to set
the current date from the stored value in /etc/timestamp. This causes
that operation to fail with the following message when /bin/sh is not
bash:
/etc/init.d/rc: /etc/rcS.d/S55bootmisc.sh: line 73: syntax error: bad substitution
Fixed by using pattern matching removal rather than bash-specific
substring expansion.
[YOCTO #6566]
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index ccc7f9f1f4..df553bc079 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh @@ -70,7 +70,11 @@ then read TIMESTAMP < /etc/timestamp if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then # format the timestamp as date expects it (2m2d2H2M4Y.2S) - date -u ${TIMESTAMP:4:8}${TIMESTAMP:0:4}.${TIMESTAMP:(-2)} + TS_YR=${TIMESTAMP%??????????} + TS_SEC=${TIMESTAMP#????????????} + TS_FIRST12=${TIMESTAMP%??} + TS_MIDDLE8=${TS_FIRST12#????} + date -u ${TS_MIDDLE8}${TS_YR}.${TS_SEC} test -x /etc/init.d/hwclock.sh && /etc/init.d/hwclock.sh stop fi fi |