From owner-svn-src-head@freebsd.org Tue Jan 21 17:16:02 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B25081FC728; Tue, 21 Jan 2020 17:16:02 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 482FYZ4C18z3K2j; Tue, 21 Jan 2020 17:16:02 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B4E3FFB3; Tue, 21 Jan 2020 17:16:02 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00LHG2q1056497; Tue, 21 Jan 2020 17:16:02 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00LHG2fJ056496; Tue, 21 Jan 2020 17:16:02 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <202001211716.00LHG2fJ056496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Tue, 21 Jan 2020 17:16:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356944 - head/libexec/rc/rc.d X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/libexec/rc/rc.d X-SVN-Commit-Revision: 356944 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jan 2020 17:16:02 -0000 Author: eugen Date: Tue Jan 21 17:16:02 2020 New Revision: 356944 URL: https://svnweb.freebsd.org/changeset/base/356944 Log: libexec/rc/rc.d/ipfw: style fix after r356943 Also, make sure it does not break for systems without ipfw code loaded. MFC after: 1 months X-MFC-with: 356943 Modified: head/libexec/rc/rc.d/ipfw Modified: head/libexec/rc/rc.d/ipfw ============================================================================== --- head/libexec/rc/rc.d/ipfw Tue Jan 21 17:02:57 2020 (r356943) +++ head/libexec/rc/rc.d/ipfw Tue Jan 21 17:16:02 2020 (r356944) @@ -127,10 +127,11 @@ ipfw_stop() ipfw_status() { status=$(sysctl -i -n net.inet.ip.fw.enable) + : ${status:=0} if afexists inet6; then - status=$(( $status + $(sysctl -i -n net.inet6.ip6.fw.enable) )) + status=$((${status} + $(sysctl -i -n net.inet6.ip6.fw.enable))) fi - if [ ${status:-0} -eq 0 ]; then + if [ ${status} -eq 0 ]; then echo "ipfw is not enabled" exit 1 else