From b936f3b05bd1a0b9a41cb4903b714fa8468db515 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Sat, 15 Oct 2016 15:34:03 +0200 Subject: [FIRE-4530] Don't show error on screen for missing IPFW sysctl key --- include/tests_firewalls | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include/tests_firewalls') diff --git a/include/tests_firewalls b/include/tests_firewalls index bbad2ce1..d92e28cc 100644 --- a/include/tests_firewalls +++ b/include/tests_firewalls @@ -329,7 +329,7 @@ if [ ${SKIPTEST} -eq 0 ]; then if [ ! -z "${SYSCTLBINARY}" ]; then # For now, only check for IPv4. - FIND=$(${SYSCTLBINARY} net.inet.ip.fw.enable | ${AWKBINARY} '{ print $2 }') + FIND=$(${SYSCTLBINARY} net.inet.ip.fw.enable 2> /dev/null | ${AWKBINARY} '{ print $2 }') if [ "${FIND}" = "1" ]; then Display --indent 2 --text "- Checking IPFW status" --result "${STATUS_RUNNING}" --color GREEN LogText "Result: IPFW is running for IPv4" @@ -345,11 +345,10 @@ LogText "Result: IPFW is disabled at start-up for IPv4" fi else - Display --indent 2 --text "- Checking IPFW status" --result "${STATUS_NOT_RUNNING}" --color YELLOW + if IsVerbose; then Display --indent 2 --text "- Checking IPFW status" --result "${STATUS_NOT_RUNNING}" --color YELLOW; fi LogText "Result: IPFW is not running for IPv4" fi else - Display --indent 2 --text "- Checking IPFW" --result "${STATUS_SKIPPED}" --color YELLOW ReportException "${TEST_NO}:1" "No IPFW test available (sysctl missing)" fi fi -- cgit v1.2.3