From f3a264fd7a5186425e44d73c1953c28041ac5299 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 28 Mar 2013 15:28:41 +0100 Subject: [PATCH] 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 --- meta/classes/systemd.bbclass | 4 ++-- meta/classes/update-rc.d.bbclass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 42fa554..69eeb9e 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -27,7 +27,7 @@ if [ -n "$D" ]; then OPTS="--root=$D" fi -if type systemctl >/dev/null; then +if type systemctl >/dev/null 2>/dev/null; then systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE} if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then @@ -37,7 +37,7 @@ fi } systemd_prerm() { -if type systemctl >/dev/null; then +if type systemctl >/dev/null 2>/dev/null; then if [ -z "$D" ]; then systemctl stop ${SYSTEMD_SERVICE} fi diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 9f1e28a..0c2b94a 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -18,7 +18,7 @@ if test "x$D" != "x"; then else OPT="-s" fi -if type update-rc.d >/dev/null; then +if type update-rc.d >/dev/null 2>/dev/null; then update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} fi } @@ -35,7 +35,7 @@ if test "$D" != ""; then else OPT="" fi -if type update-rc.d >/dev/null; then +if type update-rc.d >/dev/null 2>/dev/null; then update-rc.d $OPT ${INITSCRIPT_NAME} remove fi } -- 2.7.4