diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2013-03-28 15:28:41 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-02 18:16:24 +0100 |
| commit | c0910f26ea0d692c6d22f2e3f87cf710b31fdf0a (patch) | |
| tree | 02dbe932bed7f252c802574b14d80f7b5cc05b65 /meta/classes/systemd.bbclass | |
| parent | c47b7734614b28c740ad0eecf409f1e4c0288224 (diff) | |
| download | poky-c0910f26ea0d692c6d22f2e3f87cf710b31fdf0a.tar.gz | |
update-rc.d, systemd: redirect also stderr from type
* different shells different behavior?
bash prints 'type: update-rc.d: not found' on stderr
busybox's sh on stdout
(From OE-Core rev: 45e22312c48b23480bd6dff98702b0691a48f7d1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/systemd.bbclass')
| -rw-r--r-- | meta/classes/systemd.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 42fa554c12..69eeb9ef16 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass | |||
| @@ -27,7 +27,7 @@ if [ -n "$D" ]; then | |||
| 27 | OPTS="--root=$D" | 27 | OPTS="--root=$D" |
| 28 | fi | 28 | fi |
| 29 | 29 | ||
| 30 | if type systemctl >/dev/null; then | 30 | if type systemctl >/dev/null 2>/dev/null; then |
| 31 | systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE} | 31 | systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE} |
| 32 | 32 | ||
| 33 | if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then | 33 | if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then |
| @@ -37,7 +37,7 @@ fi | |||
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | systemd_prerm() { | 39 | systemd_prerm() { |
| 40 | if type systemctl >/dev/null; then | 40 | if type systemctl >/dev/null 2>/dev/null; then |
| 41 | if [ -z "$D" ]; then | 41 | if [ -z "$D" ]; then |
| 42 | systemctl stop ${SYSTEMD_SERVICE} | 42 | systemctl stop ${SYSTEMD_SERVICE} |
| 43 | fi | 43 | fi |