summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2014-07-17 16:56:52 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:08:59 +0100
commitb573ae80110bccb5af0857fb3c91ab3812c37f50 (patch)
tree87aa2544680477a7e249c366d67af89a8f793f70 /meta
parent779f845469370f4487c324fe5b9260355f07897f (diff)
downloadpoky-b573ae80110bccb5af0857fb3c91ab3812c37f50.tar.gz
initscripts: bootmisc.sh: Make sysctl -p honor VERBOSE
busybox sysctl may lack the "-q" setting, so simulate it with redirects. (From OE-Core rev: 5672b5188557b940340bdc3e6a3ac30835b829fb) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Ben Shelton <ben.shelton@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh7
1 files changed, 6 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 3b5a47fcdd..5211824ade 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -36,7 +36,12 @@ if [ -f "${SYSCTL_CONF}" ]
36then 36then
37 if [ -x "/sbin/sysctl" ] 37 if [ -x "/sbin/sysctl" ]
38 then 38 then
39 /sbin/sysctl -p "${SYSCTL_CONF}" 39 # busybox sysctl does not support -q
40 VERBOSE_REDIR="1>/dev/null"
41 if [ "${VERBOSE}" != "no" ]; then
42 VERBOSE_REDIR="1>&1"
43 fi
44 eval /sbin/sysctl -p "${SYSCTL_CONF}" $VERBOSE_REDIR
40 else 45 else
41 echo "To have ${SYSCTL_CONF} applied during boot, install package <procps>." 46 echo "To have ${SYSCTL_CONF} applied during boot, install package <procps>."
42 fi 47 fi