2005-06-02 Paul Jakma <paul.jakma@sun.com>

	* quagga.xml.in: Fix mistake in bgpd definition. Change dependency
	  on zebra to optional. Remove the duplicated stability statements.
	* quagga.init.in: svcprop should check PACKAGE_TARNAME, not _NAME.
	  no need to check for config file either, there's already a
	  dependency in the manifest.

diff --git a/solaris/ChangeLog b/solaris/ChangeLog
index 2f413f537a71d061dfc4b1fa104740b97fc62e5d..0713a1f237bc870d0ac3e3d96dfb0e36b5d60554 100644 (file)
--- a/solaris/ChangeLog
+++ b/solaris/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-02 Paul Jakma <paul.jakma@sun.com>
+
+       * quagga.xml.in: Fix mistake in bgpd definition. Change dependency
+         on zebra to optional. Remove the duplicated stability statements.
+       * quagga.init.in: svcprop should check PACKAGE_TARNAME, not _NAME.
+         no need to check for config file either, there's already a
+         dependency in the manifest.
+
 2005-05-13 Paul Jakma <paul.jakma@sun.com>
 
        * quagga.xml.in: Sigh, XML child elements are order-sensitive.

diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in
index 808fcbe8577eb98ae6de004776174c6c75171baf..1d3a5cd3e78f32a9c8e369d2dfb35e498361b733 100755 (executable)
--- a/solaris/quagga.init.in
+++ b/solaris/quagga.init.in
@@ -3,7 +3,7 @@
 # Copyright 2001,2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# $Id: quagga.init.in,v 1.2 2005/04/26 02:35:03 paul Exp $
+# $Id: quagga.init.in,v 1.3 2005/06/02 16:33:53 paul Exp $
 #
 # Starts/stops the appropriate daemon
 
@@ -33,7 +33,7 @@ fi
 # fmri must exist
 svcs ${FMRI} > /dev/null 2>&1 || exit $SMF_EXIT_ERR_CONFIG
 
-DAEMON=`svcprop -p @PACKAGE_NAME@/daemon_name ${FMRI} 2> /dev/null`
+DAEMON=`svcprop -p @PACKAGE_TARNAME@/daemon_name ${FMRI} 2> /dev/null`
 [ -z "${DAEMON}" ] && exit $SMF_EXIT_ERR_CONFIG
 
 case ${DAEMON} in
@@ -63,7 +63,7 @@ VTYPORT=`svcprop -p @PACKAGE_TARNAME@/vty_port ${FMRI}`
 [ -z "${PIDFILE}" ] && exit $SMF_EXIT_ERR_CONFIG
 
 # config file must exist
-[ ! -f "$CONFFILE" ] &&  exit $SMF_EXIT_ERR_CONFIG
+#[ ! -f "$CONFFILE" ] &&  exit $SMF_EXIT_ERR_CONFIG
 
 start () {
        /usr/local/quagga/sbin/${DAEMON} ${ARGS} &

diff --git a/solaris/quagga.xml.in b/solaris/quagga.xml.in
index 71a43016fe508d4022a601e7fa258a3dc6e7f432..1de74ffb0d0f42e3c0a7696784578ad7922e2b4a 100644 (file)
--- a/solaris/quagga.xml.in
+++ b/solaris/quagga.xml.in
@@ -13,6 +13,7 @@
        name='network/routing/quagga'
        type='service'
        version='1'>
+
        <!-- 
                common service-level dependencies, inherited by each instance
        -->
@@ -86,7 +87,6 @@
                            value='file://localhost/@sysconfdir@/zebra.conf' />
                </dependency>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='keep_kernel' type='boolean' 
                                value='false'/>
                        <propval name='daemon_name' type='astring'
@@ -112,7 +112,7 @@
                        inherit the rest...
                -->
                <dependency name='zebra'
-                       grouping='require_all'
+                       grouping='optional_all'
                        restart_on='restart'
                        type='service'>
                        <service_fmri value='svc:/network/routing/quagga:zebra' />
@@ -125,10 +125,9 @@
                            value='file://localhost/@sysconfdir@/bgpd.conf' />
                </dependency>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='daemon_name' type='astring'
                                value='bgpd'/>
-                       <propval name='daemon_name' type='boolean'
+                       <propval name='no_kernel' type='boolean'
                                value='false'/>
                </property_group>
                <template>
@@ -166,7 +165,6 @@
                            value='file://localhost/@sysconfdir@/ospf6d.conf' />
                </dependency>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='daemon_name' type='astring'
                                value='ospf6d'/>
                </property_group>
@@ -205,11 +203,9 @@
                            value='file://localhost/@sysconfdir@/ospfd.conf' />
                </dependency>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='retain_routes' type='boolean' value='false'/>
                </property_group>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='daemon_name' type='astring'
                                value='ospfd'/>
                </property_group>
@@ -248,11 +244,9 @@
                            value='file://localhost/@sysconfdir@/ripd.conf' />
                </dependency>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='retain_routes' type='boolean' value='false'/>
                </property_group>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='daemon_name' type='astring'
                                value='ripd'/>
                </property_group>
@@ -291,11 +285,9 @@
                            value='file://localhost/@sysconfdir@/ripngd.conf' />
                </dependency>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='retain_routes' type='boolean' value='false'/>
                </property_group>
                <property_group name='quagga' type='application'>
-                       <stability value='Evolving' />
                        <propval name='daemon_name' type='astring'
                                value='ripngd'/>
                </property_group>
@@ -315,8 +307,7 @@
 
        </instance>
 
-
-       <stability value='Unstable' />
+       <stability value='Evolving' />
 
 </service>