[solaris] Manifest referenced non-existent services, fix.
2006-04-03 Paul Jakma <paul.jakma@sun.com>
* quagga.xml.in: oops, ipvX-routing services don't exist yet in
any Solaris builds.
diff --git a/solaris/ChangeLog b/solaris/ChangeLog
index fac941d..64408f6 100644
--- a/solaris/ChangeLog
+++ b/solaris/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-03 Paul Jakma <paul.jakma@sun.com>
+
+ * quagga.xml.in: oops, ipvX-routing services don't exist yet in
+ any Solaris builds.
+
2006-03-16 Paul Jakma <paul.jakma@sun.com>
* prototype.smf.in: Oops, continue to install manifest to
diff --git a/solaris/quagga.xml.in b/solaris/quagga.xml.in
index 45fa214..d6dca8d 100644
--- a/solaris/quagga.xml.in
+++ b/solaris/quagga.xml.in
@@ -111,14 +111,16 @@
<service_fmri
value='svc:/system/filesystem/usr:default' />
</dependency>
-
+
+ <!-- Depends on Work-In-Progress, not yet in SNV
<dependency name='net'
grouping='require_all'
restart_on='none'
type='service'>
<service_fmri value='svc:/network/routing/ipv4-routing' />
</dependency>
-
+ -->
+
<dependency name='zebra'
grouping='require_all'
restart_on='restart'
@@ -204,12 +206,14 @@
value='svc:/system/filesystem/usr:default' />
</dependency>
+ <!-- Depends on WIP, not yet in SNV
<dependency name='net'
grouping='require_all'
restart_on='none'
type='service'>
<service_fmri value='svc:/network/routing/ipv6-routing' />
</dependency>
+ -->
<dependency name='zebra'
grouping='require_all'
@@ -296,12 +300,14 @@
value='svc:/system/filesystem/usr:default' />
</dependency>
+ <!-- Depends on WIP, not yet in SNV
<dependency name='net'
grouping='require_all'
restart_on='none'
type='service'>
<service_fmri value='svc:/network/routing/ipv4-routing' />
</dependency>
+ -->
<dependency name='zebra'
grouping='require_all'
@@ -388,12 +394,14 @@
value='svc:/system/filesystem/usr:default' />
</dependency>
+ <!-- Depends on WIP, not yet in SNV
<dependency name='net'
grouping='require_all'
restart_on='none'
type='service'>
<service_fmri value='svc:/network/routing/ipv6-routing' />
</dependency>
+ -->
<dependency name='zebra'
grouping='require_all'
@@ -480,7 +488,8 @@
<service_fmri
value='svc:/system/filesystem/usr:default' />
</dependency>
-
+
+ <!-- Depends on WIP, not yet in SNV
<dependency name='net'
grouping='require_any'
restart_on='none'
@@ -488,6 +497,7 @@
<service_fmri value='svc:/network/routing/ipv6-routing' />
<service_fmri value='svc:/network/routing/ipv4-routing' />
</dependency>
+ -->
<dependency name='zebra'
grouping='optional_all'