7173297 Need to update slim_source media-network-physical.xml to bring in fixes for 7152989
authorMary Ding <mary.ding@oracle.com>
Tue, 05 Jun 2012 13:42:14 -0700
changeset 1699 3d8a4abcecbc
parent 1698 e99cb9117b78
child 1700 51c908530c2e
7173297 Need to update slim_source media-network-physical.xml to bring in fixes for 7152989
usr/src/cmd/slim-install/svc/media-network-install.xml
usr/src/cmd/slim-install/svc/media-network-physical.xml
--- a/usr/src/cmd/slim-install/svc/media-network-install.xml	Tue Jun 05 00:42:34 2012 -0600
+++ b/usr/src/cmd/slim-install/svc/media-network-install.xml	Tue Jun 05 13:42:14 2012 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
- Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 
  CDDL HEADER START
 
@@ -79,6 +79,8 @@
 		     or not the service has already configured the network -->
 		<property_group name='config' type='application' >
 			<propval name='applied' type='boolean' value='false' />
+			<propval name='debug' type='boolean' value='false' />
+			<propval name='max_wait' type='count' value='2' />
 		</property_group>
 
 		<!-- The following property group is used only at install time to
--- a/usr/src/cmd/slim-install/svc/media-network-physical.xml	Tue Jun 05 00:42:34 2012 -0600
+++ b/usr/src/cmd/slim-install/svc/media-network-physical.xml	Tue Jun 05 13:42:14 2012 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
- Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 
  CDDL HEADER START
 
@@ -70,7 +70,7 @@
 	<exec_method
 		type='method'
 		name='stop'
-		exec='/lib/svc/method/net-physical %m'
+		exec='/lib/svc/method/net-physical %m %{restarter/contract}'
 		timeout_seconds='60' />
 
 	<exec_method