sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Martin Jansa 2013-03-28 15:28:41 +01:00 committed by Richard Purdie
parent c47b773461
commit c0910f26ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/systemd.bbclass
View File

@ -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

4
meta/classes/update-rc.d.bbclass
View File

@ -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
}