Avoid using grep when determining ipfw's default policy -- it may not

be available at this stage of the boot if /usr is NFS mounted.

7 files changed, 21 insertions, 14 deletions

diff --git a/etc/network.subr b/etc/network.subr
index a3ef5d8..cdc35bf 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.15 1998/02/01 00:20:56 wollman Exp $
+#	$Id: rc.network,v 1.16 1998/02/07 04:56:56 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -81,7 +81,8 @@ network_pass1() {
 	    . /etc/rc.firewall
 	    echo "Firewall rules loaded."
 	else
-	    if ipfw l 65535 | grep deny; then
+	    IPFW_DEFAULT=`ipfw l 65535`
+	    if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
 		echo -n "Warning: kernel has firewall functionality, "
 		echo "but firewall rules are not enabled."
 		echo "         All ip services are disabled."
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index a3ef5d8..cdc35bf 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.15 1998/02/01 00:20:56 wollman Exp $
+#	$Id: rc.network,v 1.16 1998/02/07 04:56:56 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -81,7 +81,8 @@ network_pass1() {
 	    . /etc/rc.firewall
 	    echo "Firewall rules loaded."
 	else
-	    if ipfw l 65535 | grep deny; then
+	    IPFW_DEFAULT=`ipfw l 65535`
+	    if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
 		echo -n "Warning: kernel has firewall functionality, "
 		echo "but firewall rules are not enabled."
 		echo "         All ip services are disabled."
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index a3ef5d8..cdc35bf 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.15 1998/02/01 00:20:56 wollman Exp $
+#	$Id: rc.network,v 1.16 1998/02/07 04:56:56 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -81,7 +81,8 @@ network_pass1() {
 	    . /etc/rc.firewall
 	    echo "Firewall rules loaded."
 	else
-	    if ipfw l 65535 | grep deny; then
+	    IPFW_DEFAULT=`ipfw l 65535`
+	    if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
 		echo -n "Warning: kernel has firewall functionality, "
 		echo "but firewall rules are not enabled."
 		echo "         All ip services are disabled."
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index a3ef5d8..cdc35bf 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.15 1998/02/01 00:20:56 wollman Exp $
+#	$Id: rc.network,v 1.16 1998/02/07 04:56:56 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -81,7 +81,8 @@ network_pass1() {
 	    . /etc/rc.firewall
 	    echo "Firewall rules loaded."
 	else
-	    if ipfw l 65535 | grep deny; then
+	    IPFW_DEFAULT=`ipfw l 65535`
+	    if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
 		echo -n "Warning: kernel has firewall functionality, "
 		echo "but firewall rules are not enabled."
 		echo "         All ip services are disabled."
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index a3ef5d8..cdc35bf 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.15 1998/02/01 00:20:56 wollman Exp $
+#	$Id: rc.network,v 1.16 1998/02/07 04:56:56 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -81,7 +81,8 @@ network_pass1() {
 	    . /etc/rc.firewall
 	    echo "Firewall rules loaded."
 	else
-	    if ipfw l 65535 | grep deny; then
+	    IPFW_DEFAULT=`ipfw l 65535`
+	    if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
 		echo -n "Warning: kernel has firewall functionality, "
 		echo "but firewall rules are not enabled."
 		echo "         All ip services are disabled."
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index a3ef5d8..cdc35bf 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.15 1998/02/01 00:20:56 wollman Exp $
+#	$Id: rc.network,v 1.16 1998/02/07 04:56:56 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -81,7 +81,8 @@ network_pass1() {
 	    . /etc/rc.firewall
 	    echo "Firewall rules loaded."
 	else
-	    if ipfw l 65535 | grep deny; then
+	    IPFW_DEFAULT=`ipfw l 65535`
+	    if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
 		echo -n "Warning: kernel has firewall functionality, "
 		echo "but firewall rules are not enabled."
 		echo "         All ip services are disabled."
diff --git a/etc/rc.network b/etc/rc.network
index a3ef5d8..cdc35bf 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.15 1998/02/01 00:20:56 wollman Exp $
+#	$Id: rc.network,v 1.16 1998/02/07 04:56:56 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -81,7 +81,8 @@ network_pass1() {
 	    . /etc/rc.firewall
 	    echo "Firewall rules loaded."
 	else
-	    if ipfw l 65535 | grep deny; then
+	    IPFW_DEFAULT=`ipfw l 65535`
+	    if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then
 		echo -n "Warning: kernel has firewall functionality, "
 		echo "but firewall rules are not enabled."
 		echo "         All ip services are disabled."