[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 fac941d63f1c84072b17d61baa523f4a4c6074e5..64408f600b4cb01b5d831c4bd829d547c95d22c0 100644 (file)
--- 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 45fa2148bc56a1792a1e3e9051da4b38408d6f00..d6dca8d277bf967bbeb607f4295b9f1c7cc6ef47 100644 (file)
--- 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'