diff options
| author | paul <paul> | 2005-06-15 11:00:11 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-06-15 11:00:11 +0000 |
| commit | 9b78d0528ad6756b051d82faddfa2c3422403a2e (patch) | |
| tree | 566594eea017950238265f3636860e3aaf2f68e5 /solaris/quagga.xml.in | |
| parent | 62debbbe836d4c96402756ccfead01b09d903428 (diff) | |
| download | quagga-9b78d0528ad6756b051d82faddfa2c3422403a2e.tar.bz2 quagga-9b78d0528ad6756b051d82faddfa2c3422403a2e.tar.xz | |
2005-06-15 Paul Jakma <paul.jakma@sun.com>
* quagga.xml.in: Pass the FMRI to the method, removing need for
daemon_name property and deducing the FMRI.
remove the empty config_file and pid_file definitions, they just
make things difficult in the method script, cause it then has to
deal with svcprop returning "" for defined empty properties.
Remove daemon_name everywhere.
* quagga.init.in: Take the FMRI as an argument
Remove deducing the FMRI from the defunct daemon_name property.
Use svcprop -q to test for presence of a property first.
Default vty_port to 0 and vty_addr to 127.1 if equivalent
SMF properties are not set.
Deduce the pid_file, we can infer it from @quagga_statedir@ I
think, it's probably not useful to allow it to be configurable
as a property anyway.
/var/run/ is on tmpfs on Solaris, so we probably will need
to create @quagga_statedir@ first run after boot.
Use @sbindir@, not /usr/local/sbin.
Diffstat (limited to 'solaris/quagga.xml.in')
| -rw-r--r-- | solaris/quagga.xml.in | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/solaris/quagga.xml.in b/solaris/quagga.xml.in index 1de74ffb..dfa2eb6b 100644 --- a/solaris/quagga.xml.in +++ b/solaris/quagga.xml.in @@ -39,19 +39,19 @@ <exec_method type='method' name='start' - exec='/lib/svc/method/quagga start %i' + exec='/lib/svc/method/quagga start %f %i' timeout_seconds='60'/> <exec_method type='method' name='stop' - exec='/lib/svc/method/quagga stop %i' + exec='/lib/svc/method/quagga stop %f %i' timeout_seconds='60' /> <exec_method type='method' name='restart' - exec='/lib/svc/method/quagga restart %i' + exec='/lib/svc/method/quagga restart %f %i' timeout_seconds='60' /> <!-- if we define these properties at the service level, each instance @@ -65,8 +65,6 @@ </property_group> <property_group name='quagga' type='application'> <!-- Options common to Quagga daemons --> - <propval name='config_file' type='astring' value='' /> - <propval name='pid_file' type='astring' value='' /> <propval name='vty_addr' type='astring' value='127.1' /> <propval name='vty_port' type='integer' value='0'/> <propval name='user' type='astring' value='@enable_user@' /> @@ -89,8 +87,6 @@ <property_group name='quagga' type='application'> <propval name='keep_kernel' type='boolean' value='false'/> - <propval name='daemon_name' type='astring' - value='zebra'/> </property_group> <template> <common_name> @@ -125,8 +121,6 @@ value='file://localhost/@sysconfdir@/bgpd.conf' /> </dependency> <property_group name='quagga' type='application'> - <propval name='daemon_name' type='astring' - value='bgpd'/> <propval name='no_kernel' type='boolean' value='false'/> </property_group> @@ -164,10 +158,6 @@ <service_fmri value='file://localhost/@sysconfdir@/ospf6d.conf' /> </dependency> - <property_group name='quagga' type='application'> - <propval name='daemon_name' type='astring' - value='ospf6d'/> - </property_group> <template> <common_name> <loctext xml:lang='C'> @@ -205,10 +195,6 @@ <property_group name='quagga' type='application'> <propval name='retain_routes' type='boolean' value='false'/> </property_group> - <property_group name='quagga' type='application'> - <propval name='daemon_name' type='astring' - value='ospfd'/> - </property_group> <template> <common_name> <loctext xml:lang='C'> @@ -246,10 +232,6 @@ <property_group name='quagga' type='application'> <propval name='retain_routes' type='boolean' value='false'/> </property_group> - <property_group name='quagga' type='application'> - <propval name='daemon_name' type='astring' - value='ripd'/> - </property_group> <template> <common_name> <loctext xml:lang='C'> @@ -285,11 +267,8 @@ value='file://localhost/@sysconfdir@/ripngd.conf' /> </dependency> <property_group name='quagga' type='application'> - <propval name='retain_routes' type='boolean' value='false'/> - </property_group> - <property_group name='quagga' type='application'> - <propval name='daemon_name' type='astring' - value='ripngd'/> + <propval name='retain_routes' type='boolean' + value='false'/> </property_group> <template> <common_name> |