2006-02-19 Paul Jakma <paul.jakma@sun.com>
* depend.*: renamed to depend.*.in.
* depend.*.in: Add version dependency.
* Makefile.am: Generate depend.* from depend.*.in
Distribute the depend.*.in files rather than the depend.*
files.
* quagga.init.in: Enable zebra if one of the link-state
daemons is started.
Restart method is not required - SMF handles that.
* quagga.xml.in: Remove restart method details.
14 files changed:
+2006-02-19 Paul Jakma <paul.jakma@sun.com>
+
+ * depend.*: renamed to depend.*.in.
+ * depend.*.in: Add version dependency.
+ * Makefile.am: Generate depend.* from depend.*.in
+ Distribute the depend.*.in files rather than the depend.*
+ files.
+ * quagga.init.in: Enable zebra if one of the link-state
+ daemons is started.
+ Restart method is not required - SMF handles that.
+ * quagga.xml.in: Remove restart method details.
+
2005-11-04 Paul Jakma <paul.jakma@sun.com>
* prototype.dev.in: lib/md5-gnu.h is now lib/md5.h
2005-11-04 Paul Jakma <paul.jakma@sun.com>
* prototype.dev.in: lib/md5-gnu.h is now lib/md5.h
# Solaris packages automake file
# Solaris packages automake file
-# $Id: Makefile.am,v 1.6 2005/05/13 07:26:07 paul Exp $
+# $Id: Makefile.am,v 1.7 2006/02/19 18:59:26 paul Exp $
%.xml: $(srcdir)/%.xml.in Makefile
rm -f $@
$(edit) $< > $@
%.xml: $(srcdir)/%.xml.in Makefile
rm -f $@
$(edit) $< > $@
+# use edit to construct the depend files
+depend.%: $(srcdir)/depend.%.in Makefile
+ rm -f $@
+ $(edit) $< > $@
# method file (bit like init script)
quagga.init: $(srcdir)/quagga.init.in Makefile
# method file (bit like init script)
quagga.init: $(srcdir)/quagga.init.in Makefile
#BUILT_SOURCES = pkginfo.daemons pkginfo.dev pkginfo.doc pkginfo.libs \
# prototype.daemons prototype.dev prototype.doc prototype.libs
BUILT_SOURCES = $(pkg_pkginfos) pkginfo.tmpl $(pkg_prototypes) \
#BUILT_SOURCES = pkginfo.daemons pkginfo.dev pkginfo.doc pkginfo.libs \
# prototype.daemons prototype.dev prototype.doc prototype.libs
BUILT_SOURCES = $(pkg_pkginfos) pkginfo.tmpl $(pkg_prototypes) \
- $(pkg_manifests) quagga.init
+ $(pkg_manifests) $(pkg_depends) quagga.init
CLEANFILES := $(BUILT_SOURCES) $(pkg_packages)
CLEANFILES := $(BUILT_SOURCES) $(pkg_packages)
-EXTRA_DIST := $(pkg_depends) $(pkg_manifests:%=%.in) $(pkg_prototypes:%=%.in) \
+EXTRA_DIST := $(pkg_manifests:%=%.in) $(pkg_prototypes:%=%.in) \
$(pkg_names:%=pkginfo.%.tmpl.in) $(srcdir)/pkginfo.tmpl.in \
$(pkg_names:%=pkginfo.%.tmpl.in) $(srcdir)/pkginfo.tmpl.in \
- quagga.init.in README.txt
+ $(pkg_depends:%=%.in) quagga.init.in README.txt
pkg-root-install:
(cd $(top_builddir) && \
pkg-root-install:
(cd $(top_builddir) && \
+++ /dev/null
-P QUAGGAlibs Quagga common runtime libraries
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsr Core Solaris Libraries (Root)
-P SUNWcnetr Core Solaris Network Infrastructure (Root)
-I SUNWzebrar
-I SUNWzebrau
-I CSWzebra
--- /dev/null
+P QUAGGAlibs Quagga common runtime libraries
+ @PACKAGE_VERSION@,REV=@CONFDATE@
+P SUNWcsu Core Solaris, (Usr)
+P SUNWcsr Core Solaris Libraries (Root)
+P SUNWcnetr Core Solaris Network Infrastructure (Root)
+I SUNWzebrar
+I SUNWzebrau
+I CSWzebra
+++ /dev/null
-P QUAGGAlibs Quagga common runtime libraries
--- /dev/null
+P QUAGGAlibs Quagga common runtime libraries
+ @PACKAGE_VERSION@,REV=@CONFDATE@
+++ /dev/null
-P SUNWdoc Documentation Tools
--- /dev/null
+P SUNWdoc Documentation Tools
+++ /dev/null
-P SUNWcslr Core Solaris Libraries (Root)
-P SUNWcsl Core Solaris, (Shared Libs)
-P SUNWlibmsr Math & Microtasking Libraries (Root)
-R QUAGGAdaemons Quagga daemons
-R QUAGGAdev
--- /dev/null
+P SUNWcslr Core Solaris Libraries (Root)
+P SUNWcsl Core Solaris, (Shared Libs)
+P SUNWlibmsr Math & Microtasking Libraries (Root)
+R QUAGGAdaemons Quagga daemons
+R QUAGGAdev
+++ /dev/null
-P QUAGGAdaemons Quagga daemons
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsr Core Solaris Libraries (Root)
-I SUNWzebrar
-I SUNWzebrau
-I CSWzebra
--- /dev/null
+P QUAGGAdaemons Quagga daemons
+ @PACKAGE_VERSION@,REV=@CONFDATE@
+P SUNWcsu Core Solaris, (Usr)
+P SUNWcsr Core Solaris Libraries (Root)
+I SUNWzebrar
+I SUNWzebrau
+I CSWzebra
# Copyright 2001,2003 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Copyright 2001,2003 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# $Id: quagga.init.in,v 1.4 2005/06/15 11:00:11 paul Exp $
+# $Id: quagga.init.in,v 1.5 2006/02/19 18:59:26 paul Exp $
#
# Starts/stops the appropriate daemon
#
# Starts/stops the appropriate daemon
svcs ${FMRI} > /dev/null 2>&1 || exit $SMF_EXIT_ERR_CONFIG
case ${INSTANCE} in
svcs ${FMRI} > /dev/null 2>&1 || exit $SMF_EXIT_ERR_CONFIG
case ${INSTANCE} in
- zebra | ospfd | ospf6d | ripd | ripngd | bgpd )
+ zebra | bgpd )
+ ;;
+ ospfd | ospf6d | ripd | ripngd )
+ /usr/sbin/svcadm enable zebra
ARGS="${ARGS} --pid_file ${PIDFILE}"
fi
ARGS="${ARGS} --pid_file ${PIDFILE}"
fi
-# config file must exist
-#[ ! -f "$CONFFILE" ] && exit $SMF_EXIT_ERR_CONFIG
-
# we need @quagga_statedir@ to exist, it might be on tmpfs.
if [ ! -d @quagga_statedir@ ] ; then
mkdir -p @quagga_statedir@
# we need @quagga_statedir@ to exist, it might be on tmpfs.
if [ ! -d @quagga_statedir@ ] ; then
mkdir -p @quagga_statedir@
-restart() {
- stop ${INSTANCE}
- sleep 1
- start ${INSTANCE}
-}
-
case $1 in
'start')
start ${2}
case $1 in
'start')
start ${2}
-'restart')
- restart ${2}
- ;;
exec='/lib/svc/method/quagga stop %f %i'
timeout_seconds='60' />
exec='/lib/svc/method/quagga stop %f %i'
timeout_seconds='60' />
- <exec_method
- type='method'
- name='restart'
- exec='/lib/svc/method/quagga restart %f %i'
- timeout_seconds='60' />
<!--
if we define these properties at the service level, each instance
inherits them, and it can override with desired values.
<!--
if we define these properties at the service level, each instance
inherits them, and it can override with desired values.