Patchwork [v2,1/6] initscripts: bootmisc.sh: Make sysctl -p honor VERBOSE

login
register
mail settings
Submitter Ben Shelton
Date July 17, 2014, 9:56 p.m.
Message ID <315504745a3addb5e02a807e3a2062eb6cbe2ed3.1405633546.git.ben.shelton@ni.com>
Download mbox | patch
Permalink /patch/75955/
State Accepted
Commit b573ae80110bccb5af0857fb3c91ab3812c37f50
Headers show

Comments

Ben Shelton - July 17, 2014, 9:56 p.m.
From: Richard Tollerton <rich.tollerton@ni.com>

busybox sysctl may lack the "-q" setting, so simulate it with redirects.

Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
---
 meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 3b5a47f..5211824 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}" ]
 then
 	if [ -x "/sbin/sysctl" ]
 	then
-		/sbin/sysctl -p "${SYSCTL_CONF}"
+		# busybox sysctl does not support -q
+		VERBOSE_REDIR="1>/dev/null"
+		if [ "${VERBOSE}" != "no" ]; then
+			VERBOSE_REDIR="1>&1"
+		fi
+		eval /sbin/sysctl -p "${SYSCTL_CONF}" $VERBOSE_REDIR
 	else
 		echo "To have ${SYSCTL_CONF} applied during boot, install package <procps>."
 	fi