OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 25-Jul-2003 11:23:36
Branch: HEAD Handle: 2003072510233402
Modified files:
openpkg-src/zebra rc.zebra zebra.spec
openpkg-web news.txt
Log:
extend bind/listen logic to companion daemons
Summary:
Revision Changes Path
1.15 +30 -13 openpkg-src/zebra/rc.zebra
1.43 +1 -1 openpkg-src/zebra/zebra.spec
1.5804 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/rc.zebra
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.zebra
--- openpkg-src/zebra/rc.zebra 24 Jul 2003 21:04:15 -0000 1.14
+++ openpkg-src/zebra/rc.zebra 25 Jul 2003 09:23:36 -0000 1.15
@@ -9,6 +9,15 @@
zebra_flags=""
zebra_bind="127.0.0.1"
zebra_port="2601"
+ zebra_rip_flags=""
+ zebra_rip_bind="${zebra_bind}"
+ zebra_rip_port="2602"
+ zebra_ospf_flags=""
+ zebra_ospf_bind="${zebra_bind}"
+ zebra_ospf_port="2604"
+ zebra_bgp_flags=""
+ zebra_bgp_bind="${zebra_bind}"
+ zebra_bgp_port="2605"
zebra_log_prolog="true"
zebra_log_epilog="true"
zebra_log_numfiles="10"
@@ -31,20 +40,28 @@
%start -u @l_susr@
rcService zebra enable yes || exit 0
rcService zebra active yes && exit 0
- flags="$zebra_flags"
- echo $flags | grep -- -A >/dev/null
- if [ $? -ne 0 -a ".$zebra_bind" != . ]; then
- flags="$flags -A $zebra_bind"
- fi
- echo $flags | grep -- -P >/dev/null
- if [ $? -ne 0 -a ".$zebra_port" != . ]; then
- flags="$flags -P $zebra_port"
- fi
cd @l_prefix@/etc/zebra
- @l_prefix@/sbin/zebra -d $flags
- for protocol in $zebra_protocols; do
- if [ -f @l_prefix@/sbin/${protocol}d ]; then
- @l_prefix@/sbin/${protocol}d -d
+ for i in zebra $zebra_protocols; do
+ if [ ".$i" = .zebra ]; then
+ midfix=""
+ daemon="${i}";
+ else
+ midfix="${i}_";
+ daemon="${i}d";
+ fi
+ if [ -x @l_prefix@/sbin/${daemon} ]; then
+ flags=`eval echo \\\$zebra_${midfix}flags`;
+ extra=`eval echo \\\$zebra_${midfix}bind`;
+ echo $flags | grep -- -A >/dev/null
+ if [ $? -ne 0 -a ".$extra" != . ]; then
+ flags="$flags -A $extra"
+ fi
+ extra=`eval echo \\\$zebra_${midfix}port`;
+ echo $flags | grep -- -P >/dev/null
+ if [ $? -ne 0 -a ".$extra" != . ]; then
+ flags="$flags -P $extra"
+ fi
+ @l_prefix@/sbin/${daemon} -d ${flags}
fi
done
@l_prefix@/bin/vtysh -b
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/zebra.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 zebra.spec
--- openpkg-src/zebra/zebra.spec 24 Jul 2003 07:03:19 -0000 1.42
+++ openpkg-src/zebra/zebra.spec 25 Jul 2003 09:23:36 -0000 1.43
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.93b
-Release: 20030724
+Release: 20030725
# list of sources
Source0: ftp://ftp.zebra.org/pub/zebra/zebra-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5803 -r1.5804 news.txt
--- openpkg-web/news.txt 25 Jul 2003 09:18:36 -0000 1.5803
+++ openpkg-web/news.txt 25 Jul 2003 09:23:34 -0000 1.5804
@@ -1,3 +1,4 @@
+25-Jul-2003: Upgraded package: P<zebra-0.93b-20030725>
25-Jul-2003: Upgraded package: P<zebra-0.93b-1.20030725>
25-Jul-2003: Upgraded package: P<vim-6.2.31-1.20030725>
25-Jul-2003: Upgraded package: P<smtpfeed-1.18-1.20030725>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
