16940545 svc:/network/samba:default should not depend explicitly on svc:/network/physical
authorVladimir Marek <Vladimir.Marek@oracle.com>
Tue, 18 Jun 2013 10:30:50 +0200
changeset 1376 4d3c056d2447
parent 1375 911e532601b4
child 1377 abacfa47fabf
16940545 svc:/network/samba:default should not depend explicitly on svc:/network/physical 16940882 svc:/network/wins:default shouldn't depend explicitly on network/physical 16940849 svc:/network/winbind:default shouldn't depend explicitly on network/physical
components/samba/samba/Solaris/samba.xml
components/samba/samba/Solaris/winbind.xml
components/samba/samba/Solaris/wins.xml
--- a/components/samba/samba/Solaris/samba.xml	Thu Jun 27 14:47:18 2013 -0700
+++ b/components/samba/samba/Solaris/samba.xml	Tue Jun 18 10:30:50 2013 +0200
@@ -23,7 +23,7 @@
 -->
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-	Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+	Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 
 	#ident	"@(#)samba.xml	1.6	10/07/26 SMI"
 
@@ -41,9 +41,9 @@
 
 	<single_instance/>
 
-	<dependency name='net-loopback' grouping='require_any'
+	<dependency name='network' grouping='require_all'
 			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/loopback' />
+		<service_fmri value='svc:/milestone/network' />
 	</dependency>
 
 	<dependency name='net-service' grouping='require_all'
@@ -51,11 +51,6 @@
 		<service_fmri value='svc:/network/service'/>
 	</dependency>
 
-	<dependency name='net-physical' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/physical' />
-	</dependency>
-
 	<dependency name='filesystem-local' grouping='require_all'
 			restart_on='none' type='service'>
 		<service_fmri value='svc:/system/filesystem/local' />
--- a/components/samba/samba/Solaris/winbind.xml	Thu Jun 27 14:47:18 2013 -0700
+++ b/components/samba/samba/Solaris/winbind.xml	Tue Jun 18 10:30:50 2013 +0200
@@ -23,7 +23,7 @@
 -->
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-	Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+	Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 
 	#ident	"@(#)winbind.xml	1.2	10/07/26 SMI"
 
@@ -41,9 +41,9 @@
 
 	<single_instance/>
 
-	<dependency name='net-loopback' grouping='require_any'
+	<dependency name='network' grouping='require_all'
 			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/loopback' />
+		<service_fmri value='svc:/milestone/network' />
 	</dependency>
 
 	<dependency name='net-service' grouping='require_all'
@@ -51,11 +51,6 @@
 		<service_fmri value='svc:/network/service'/>
 	</dependency>
 
-	<dependency name='net-physical' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/physical' />
-	</dependency>
-
 	<dependency name='filesystem-local' grouping='require_all'
 			restart_on='none' type='service'>
 		<service_fmri value='svc:/system/filesystem/local' />
--- a/components/samba/samba/Solaris/wins.xml	Thu Jun 27 14:47:18 2013 -0700
+++ b/components/samba/samba/Solaris/wins.xml	Tue Jun 18 10:30:50 2013 +0200
@@ -23,7 +23,7 @@
 -->
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-	Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+	Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 
 	#ident	"@(#)wins.xml	1.2	10/07/26 SMI"
 
@@ -41,9 +41,9 @@
 
 	<single_instance/>
 
-	<dependency name='net-loopback' grouping='require_any'
+	<dependency name='network' grouping='require_all'
 			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/loopback' />
+		<service_fmri value='svc:/milestone/network' />
 	</dependency>
 
 	<dependency name='net-service' grouping='require_all'
@@ -51,11 +51,6 @@
 		<service_fmri value='svc:/network/service'/>
 	</dependency>
 
-	<dependency name='net-physical' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/physical' />
-	</dependency>
-
 	<dependency name='filesystem-local' grouping='require_all'
 			restart_on='none' type='service'>
 		<service_fmri value='svc:/system/filesystem/local' />