6425112 network/service shouldn't write to filesystems it doesn't depend on

6499493 machine installed with snv_53 can not find default router automatically (only after sys-unconfig?)
6503806 md_monitord Makefile install target needs a dependency on SVCMETHOD

1 files changed, 8 insertions, 3 deletions

diff --git a/usr/src/cmd/svc/milestone/net-routing-setup b/usr/src/cmd/svc/milestone/net-routing-setup
index df276e4153..09f5f4eabe 100644
--- a/usr/src/cmd/svc/milestone/net-routing-setup
+++ b/usr/src/cmd/svc/milestone/net-routing-setup
@@ -184,21 +184,26 @@ if [ -z "$defrouters" ]; then
 	#
 	# Set default value for ipv4-routing to enabled.  If routeadm -e/-d
 	# has not yet been run by the administrator, we apply this default.
+	# The -b option is project-private and informs routeadm not
+	# to treat the enable as administrator-driven.
 	#
 	/usr/sbin/svccfg -s $SMF_FMRI \
 	    setprop routeadm/default-ipv4-routing = true
 	if [ "$ipv4_routing_set" = "false" ]; then
-		/sbin/routeadm -e ipv4-routing -u
+		/sbin/routeadm -b -e ipv4-routing -u
 	fi
 else
 	#
 	# Default router(s) have been found,  so ipv4-routing default value
 	# should be disabled.  If routaedm -e/d has not yet been run by
-	# the administrator, we apply this default.
+	# the administrator, we apply this default.  The -b option is
+	# project-private and informs routeadm not to treat the disable as
+	# administrator-driven.
+	#
 	/usr/sbin/svccfg -s $SMF_FMRI \
 	    setprop routeadm/default-ipv4-routing = false
 	if [ "$ipv4_routing_set" = "false" ]; then
-		/sbin/routeadm -d ipv4-routing -u
+		/sbin/routeadm -b -d ipv4-routing -u
 	fi
 fi