diff options
| author | Martin Dietze <di@fh-wedel.de> | 2006-11-02 13:54:27 +0000 |
|---|---|---|
| committer | Martin Dietze <di@fh-wedel.de> | 2006-11-02 13:54:27 +0000 |
| commit | 692ece420e958fe5fdc4e4f01cacfe46ac271abd (patch) | |
| tree | 225d30020d4c07bfe78de2922978f05d8e4f4870 | |
| parent | 9349f11f6676d641d6d7f52a5bdfcab23afb928b (diff) | |
rootfs_ipk.bbclass and ipkg.inc: shell script syntax fixes
- both files contained code which would only execute if run by bash
- the fixed versions do the same but are more portable
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 2 | ||||
| -rw-r--r-- | packages/ipkg/ipkg.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 8cea393b43..eeb3f75e11 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -98,7 +98,7 @@ log_check() { for keyword_die in "Cannot find package" "exit 1" ERR Fail do - if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null + if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 then echo "log_check: There were error messages in the logfile" echo -e "log_check: Matched keyword: [$keyword_die]\n" diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc index adc7714bea..b1e2f19267 100644 --- a/packages/ipkg/ipkg.inc +++ b/packages/ipkg/ipkg.inc @@ -26,7 +26,7 @@ pkg_postinst_ipkg () { if [ "x$D" != "x" ]; then install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d # this happens at S98 where our good 'ole packages script used to run - echo -e "#!/bin/sh + echo "#!/bin/sh ipkg-cl configure " > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure |