- latest upstream version
- merged initscript patches
This commit is contained in:
Jiri Skala
parent
1acef02939
commit
24df282d78
@ -1 +1 @@
|
|||||||
quagga-0.99.15.tar.gz
|
quagga-0.99.16.tar.gz
|
||||||
|
|||||||
@ -1,70 +0,0 @@
|
|||||||
--- quagga-0.96.5/redhat/bgpd.init.nostart 2004-09-09 17:20:54.329037601 -0400
|
|
||||||
+++ quagga-0.96.5/redhat/bgpd.init 2004-09-09 17:20:54.332037209 -0400
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
-# chkconfig: 2345 16 84
|
|
||||||
+# chkconfig: - 16 84
|
|
||||||
# description: A BGPv4, BGPv4+, BGPv4- routing engine for use with Zebra
|
|
||||||
#
|
|
||||||
# processname: bgpd
|
|
||||||
--- quagga-0.96.5/redhat/isisd.init.nostart 2004-09-09 17:20:54.335036817 -0400
|
|
||||||
+++ quagga-0.96.5/redhat/isisd.init 2004-09-09 17:20:54.337036556 -0400
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
-# chkconfig: 2345 16 84
|
|
||||||
+# chkconfig: - 16 84
|
|
||||||
# description: An ISIS routing engine for use with Quagga
|
|
||||||
#
|
|
||||||
# processname: isisd
|
|
||||||
--- quagga-0.96.5/redhat/ospf6d.init.nostart 2004-09-09 17:20:54.340036164 -0400
|
|
||||||
+++ quagga-0.96.5/redhat/ospf6d.init 2004-09-09 17:20:54.342035903 -0400
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
-# chkconfig: 2345 16 84
|
|
||||||
+# chkconfig: - 16 84
|
|
||||||
# description: An OSPF routing engine for use with Zebra and IPv6
|
|
||||||
#
|
|
||||||
# processname: ospf6d
|
|
||||||
--- quagga-0.96.5/redhat/ospfd.init.nostart 2004-09-09 17:20:54.345035511 -0400
|
|
||||||
+++ quagga-0.96.5/redhat/ospfd.init 2004-09-09 17:20:54.347035250 -0400
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
-# chkconfig: 2345 16 84
|
|
||||||
+# chkconfig: - 16 84
|
|
||||||
# description: An OSPF v2 routing engine for use with Zebra
|
|
||||||
#
|
|
||||||
# processname: ospfd
|
|
||||||
--- quagga-0.96.5/redhat/ripd.init.nostart 2004-09-09 17:20:54.350034858 -0400
|
|
||||||
+++ quagga-0.96.5/redhat/ripd.init 2004-09-09 17:20:54.353034466 -0400
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
-# chkconfig: 2345 16 84
|
|
||||||
+# chkconfig: - 16 84
|
|
||||||
# description: A RIP routing engine for use with Zebra
|
|
||||||
#
|
|
||||||
# processname: ripd
|
|
||||||
--- quagga-0.96.5/redhat/ripngd.init.nostart 2004-09-09 17:20:54.356034074 -0400
|
|
||||||
+++ quagga-0.96.5/redhat/ripngd.init 2004-09-09 17:20:54.359033682 -0400
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
-# chkconfig: 2345 16 84
|
|
||||||
+# chkconfig: - 16 84
|
|
||||||
# description: A RIP routing engine for use with Zebra and IPv6
|
|
||||||
#
|
|
||||||
# processname: ripngd
|
|
||||||
--- quagga-0.96.5/redhat/zebra.init.nostart 2004-09-09 17:20:54.361033421 -0400
|
|
||||||
+++ quagga-0.96.5/redhat/zebra.init 2004-09-09 17:20:54.364033029 -0400
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
-# chkconfig: 2345 15 85
|
|
||||||
+# chkconfig: - 15 85
|
|
||||||
# description: GNU Zebra routing manager
|
|
||||||
#
|
|
||||||
# processname: zebra
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- quagga-0.98.5/ltmain.sh.pie 2005-10-18 23:03:50.000000000 -0400
|
|
||||||
+++ quagga-0.98.5/ltmain.sh 2005-10-18 23:04:05.000000000 -0400
|
|
||||||
@@ -723,7 +723,7 @@
|
|
||||||
command="$base_compile $srcfile $pic_flag"
|
|
||||||
else
|
|
||||||
# Don't build PIC code
|
|
||||||
- command="$base_compile $srcfile"
|
|
||||||
+ command="$base_compile $srcfile -fPIC"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test ! -d "${xdir}$objdir"; then
|
|
||||||
@@ -803,7 +803,7 @@
|
|
||||||
if test "$build_old_libs" = yes; then
|
|
||||||
if test "$pic_mode" != yes; then
|
|
||||||
# Don't build PIC code
|
|
||||||
- command="$base_compile $srcfile"
|
|
||||||
+ command="$base_compile $srcfile -fPIC"
|
|
||||||
else
|
|
||||||
command="$base_compile $srcfile $pic_flag"
|
|
||||||
fi
|
|
||||||
@ -1,108 +0,0 @@
|
|||||||
diff -up quagga-0.99.15/redhat/bgpd.init.lsbhdr quagga-0.99.15/redhat/bgpd.init
|
|
||||||
--- quagga-0.99.15/redhat/bgpd.init.lsbhdr 2010-01-26 09:06:55.854903364 +0100
|
|
||||||
+++ quagga-0.99.15/redhat/bgpd.init 2010-01-26 09:07:26.385905447 +0100
|
|
||||||
@@ -1,8 +1,9 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-### BEGIN INIT INFO
|
|
||||||
-# Provides: bgpd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
# config: /etc/quagga/bgpd.conf
|
|
||||||
+
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: bgpd
|
|
||||||
# Short-Description: A BGPv4, BGPv4+, BGPv4- routing engine
|
|
||||||
# Description: A BGPv4, BGPv4+, BGPv4- routing engine for use with Zebra
|
|
||||||
### END INIT INFO
|
|
||||||
diff -up quagga-0.99.15/redhat/isisd.init.lsbhdr quagga-0.99.15/redhat/isisd.init
|
|
||||||
--- quagga-0.99.15/redhat/isisd.init.lsbhdr 2010-01-26 09:07:38.577183863 +0100
|
|
||||||
+++ quagga-0.99.15/redhat/isisd.init 2010-01-26 09:07:57.880904573 +0100
|
|
||||||
@@ -1,10 +1,11 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-### BEGIN INIT INFO
|
|
||||||
-# Provides: isisd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
# config: /etc/quagga/isisd.conf
|
|
||||||
+
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: isisd
|
|
||||||
# Short-Description: An ISIS routing engine
|
|
||||||
-# description: An ISIS routing engine for use with Quagga
|
|
||||||
+# Description: An ISIS routing engine for use with Quagga
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
# source function library
|
|
||||||
diff -up quagga-0.99.15/redhat/ospf6d.init.lsbhdr quagga-0.99.15/redhat/ospf6d.init
|
|
||||||
--- quagga-0.99.15/redhat/ospf6d.init.lsbhdr 2010-01-26 09:08:12.302153648 +0100
|
|
||||||
+++ quagga-0.99.15/redhat/ospf6d.init 2010-01-26 09:08:24.141905152 +0100
|
|
||||||
@@ -1,8 +1,9 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-### BEGIN INIT INFO
|
|
||||||
-# Provides: ospf6d
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
# config: /etc/quagga/ospf6d.conf
|
|
||||||
+
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: ospf6d
|
|
||||||
# Short-Description: A OSPF routing engine for IPv6
|
|
||||||
# Description: An OSPF routing engine for use with Zebra and IPv6
|
|
||||||
### END INIT INFO
|
|
||||||
diff -up quagga-0.99.15/redhat/ospfd.init.lsbhdr quagga-0.99.15/redhat/ospfd.init
|
|
||||||
--- quagga-0.99.15/redhat/ospfd.init.lsbhdr 2010-01-26 09:08:47.332938279 +0100
|
|
||||||
+++ quagga-0.99.15/redhat/ospfd.init 2010-01-26 09:08:59.255952679 +0100
|
|
||||||
@@ -1,8 +1,9 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-### BEGIN INIT INFO
|
|
||||||
-# Provides: ospfd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
# config: /etc/quagga/ospfd.conf
|
|
||||||
+
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: ospfd
|
|
||||||
# Short-Description: A OSPF v2 routing engine
|
|
||||||
# Description: An OSPF v2 routing engine for use with Zebra
|
|
||||||
### END INIT INFO
|
|
||||||
diff -up quagga-0.99.15/redhat/ripd.init.lsbhdr quagga-0.99.15/redhat/ripd.init
|
|
||||||
--- quagga-0.99.15/redhat/ripd.init.lsbhdr 2010-01-26 09:09:17.379154898 +0100
|
|
||||||
+++ quagga-0.99.15/redhat/ripd.init 2010-01-26 09:09:33.417905029 +0100
|
|
||||||
@@ -1,8 +1,9 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-### BEGIN INIT INFO
|
|
||||||
-# Provides: ripd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
# config: /etc/quagga/ripd.conf
|
|
||||||
+
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: ripd
|
|
||||||
# Short-Description: A RIP routing engine
|
|
||||||
# Description: A RIP routing engine for use with Zebra
|
|
||||||
### END INIT INFO
|
|
||||||
diff -up quagga-0.99.15/redhat/ripngd.init.lsbhdr quagga-0.99.15/redhat/ripngd.init
|
|
||||||
--- quagga-0.99.15/redhat/ripngd.init.lsbhdr 2010-01-26 09:09:45.168935194 +0100
|
|
||||||
+++ quagga-0.99.15/redhat/ripngd.init 2010-01-26 09:10:02.713154585 +0100
|
|
||||||
@@ -1,8 +1,9 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-### BEGIN INIT INFO
|
|
||||||
-# Provides: ripngd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
# config: /etc/quagga/ripngd.conf
|
|
||||||
+
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: ripngd
|
|
||||||
# Short-Description: A RIP routing engine for IPv6
|
|
||||||
# Description: A RIP routing engine for use with Zebra and IPv6
|
|
||||||
### END INIT INFO
|
|
||||||
diff -up quagga-0.99.15/redhat/zebra.init.lsbhdr quagga-0.99.15/redhat/zebra.init
|
|
||||||
--- quagga-0.99.15/redhat/zebra.init.lsbhdr 2010-01-26 10:39:02.042238770 +0100
|
|
||||||
+++ quagga-0.99.15/redhat/zebra.init 2010-01-26 10:39:18.070133989 +0100
|
|
||||||
@@ -1,8 +1,9 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-### BEGIN INIT INFO
|
|
||||||
-# Provides: zebra
|
|
||||||
# chkconfig: - 15 85
|
|
||||||
# config: /etc/quagga/zebra.conf
|
|
||||||
+
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: zebra
|
|
||||||
# Short-Description: GNU Zebra routing manager
|
|
||||||
# Description: GNU Zebra routing manager
|
|
||||||
### END INIT INFO
|
|
||||||
@ -1,228 +0,0 @@
|
|||||||
diff -up quagga-0.99.15/redhat/bgpd.init.posix quagga-0.99.15/redhat/bgpd.init
|
|
||||||
--- quagga-0.99.15/redhat/bgpd.init.posix 2009-10-19 08:52:03.018303218 +0200
|
|
||||||
+++ quagga-0.99.15/redhat/bgpd.init 2009-10-19 09:58:18.694292887 +0200
|
|
||||||
@@ -30,6 +30,10 @@ case "$1" in
|
|
||||||
|
|
||||||
# The process must be configured first.
|
|
||||||
[ -f $CONF_FILE ] || exit 6
|
|
||||||
+ if [ `id -u` -ne 0 ]; then
|
|
||||||
+ echo $"Insufficient privilege" 1>&2
|
|
||||||
+ exit 4
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
echo -n $"Starting $PROG: "
|
|
||||||
daemon $cmd -d $BGPD_OPTS
|
|
||||||
@@ -44,12 +48,12 @@ case "$1" in
|
|
||||||
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
- restart|reload)
|
|
||||||
+ restart|reload|force-reload)
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
- condrestart)
|
|
||||||
+ condrestart|try-restart)
|
|
||||||
if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
@@ -61,7 +65,7 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
|
||||||
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
diff -up quagga-0.99.15/redhat/ospf6d.init.posix quagga-0.99.15/redhat/ospf6d.init
|
|
||||||
--- quagga-0.99.15/redhat/ospf6d.init.posix 2009-10-19 08:54:10.135543594 +0200
|
|
||||||
+++ quagga-0.99.15/redhat/ospf6d.init 2009-10-19 09:53:29.288294085 +0200
|
|
||||||
@@ -29,6 +29,10 @@ case "$1" in
|
|
||||||
|
|
||||||
# The process must be configured first.
|
|
||||||
[ -f $CONF_FILE ] || exit 6
|
|
||||||
+ if [ `id -u` -ne 0 ]; then
|
|
||||||
+ echo $"Insufficient privilege" 1>&2
|
|
||||||
+ exit 4
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
echo -n $"Starting $PROG: "
|
|
||||||
daemon $cmd -d $OSPF6D_OPTS
|
|
||||||
@@ -43,12 +47,12 @@ case "$1" in
|
|
||||||
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
- restart|reload)
|
|
||||||
+ restart|reload|force-reload)
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
- condrestart)
|
|
||||||
+ condrestart|try-restart)
|
|
||||||
if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
@@ -60,7 +64,7 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
|
|
||||||
+ echo $"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
diff -up quagga-0.99.15/redhat/ospfd.init.posix quagga-0.99.15/redhat/ospfd.init
|
|
||||||
--- quagga-0.99.15/redhat/ospfd.init.posix 2009-10-19 08:52:03.017303137 +0200
|
|
||||||
+++ quagga-0.99.15/redhat/ospfd.init 2009-10-19 09:56:42.380294279 +0200
|
|
||||||
@@ -29,6 +29,10 @@ case "$1" in
|
|
||||||
|
|
||||||
# The process must be configured first.
|
|
||||||
[ -f $CONF_FILE ] || exit 6
|
|
||||||
+ if [ `id -u` -ne 0 ]; then
|
|
||||||
+ echo $"Insufficient privilege" 1>&2
|
|
||||||
+ exit 4
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
echo -n $"Starting $PROG: "
|
|
||||||
daemon $cmd -d $OSPFD_OPTS
|
|
||||||
@@ -43,12 +47,12 @@ case "$1" in
|
|
||||||
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
- restart|reload)
|
|
||||||
+ restart|reload|force-reload)
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
- condrestart)
|
|
||||||
+ condrestart|try-restart)
|
|
||||||
if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
@@ -60,7 +64,7 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
|
|
||||||
+ echo $"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
diff -up quagga-0.99.15/redhat/ripd.init.posix quagga-0.99.15/redhat/ripd.init
|
|
||||||
--- quagga-0.99.15/redhat/ripd.init.posix 2009-10-19 09:57:08.605329988 +0200
|
|
||||||
+++ quagga-0.99.15/redhat/ripd.init 2009-10-19 09:59:21.872294779 +0200
|
|
||||||
@@ -29,6 +29,10 @@ case "$1" in
|
|
||||||
|
|
||||||
# The process must be configured first.
|
|
||||||
[ -f $CONF_FILE ] || exit 6
|
|
||||||
+ if [ `id -u` -ne 0 ]; then
|
|
||||||
+ echo $"Insufficient privilege" 1>&2
|
|
||||||
+ exit 4
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
echo -n $"Starting $PROG: "
|
|
||||||
daemon $cmd -d $RIPD_OPTS
|
|
||||||
@@ -43,12 +47,12 @@ case "$1" in
|
|
||||||
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
- restart|reload)
|
|
||||||
+ restart|reload|force-reload)
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
- condrestart)
|
|
||||||
+ condrestart|try-restart)
|
|
||||||
if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
@@ -60,7 +64,7 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
|
||||||
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
diff -up quagga-0.99.15/redhat/ripngd.init.posix quagga-0.99.15/redhat/ripngd.init
|
|
||||||
--- quagga-0.99.15/redhat/ripngd.init.posix 2009-10-19 09:59:42.545325446 +0200
|
|
||||||
+++ quagga-0.99.15/redhat/ripngd.init 2009-10-19 10:04:01.286294713 +0200
|
|
||||||
@@ -29,6 +29,10 @@ case "$1" in
|
|
||||||
|
|
||||||
# The process must be configured first.
|
|
||||||
[ -f $CONF_FILE ] || exit 6
|
|
||||||
+ if [ `id -u` -ne 0 ]; then
|
|
||||||
+ echo $"Insufficient privilege" 1>&2
|
|
||||||
+ exit 4
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
echo -n $"Starting $PROG: "
|
|
||||||
daemon $cmd -d $RIPNGD_OPTS
|
|
||||||
@@ -43,12 +47,12 @@ case "$1" in
|
|
||||||
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
- restart|reload)
|
|
||||||
+ restart|reload|force-reload)
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
- condrestart)
|
|
||||||
+ condrestart|try-restart)
|
|
||||||
if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
@@ -60,7 +64,7 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
|
||||||
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
diff -up quagga-0.99.15/redhat/zebra.init.posix quagga-0.99.15/redhat/zebra.init
|
|
||||||
--- quagga-0.99.15/redhat/zebra.init.posix 2009-10-19 10:00:32.754573536 +0200
|
|
||||||
+++ quagga-0.99.15/redhat/zebra.init 2009-10-19 10:06:26.378294314 +0200
|
|
||||||
@@ -26,6 +26,10 @@ case "$1" in
|
|
||||||
|
|
||||||
# The process must be configured first.
|
|
||||||
[ -f $CONF_FILE ] || exit 6
|
|
||||||
+ if [ `id -u` -ne 0 ]; then
|
|
||||||
+ echo $"Insufficient privilege" 1>&2
|
|
||||||
+ exit 4
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
echo -n $"Starting $PROG: "
|
|
||||||
|
|
||||||
@@ -43,12 +47,12 @@ case "$1" in
|
|
||||||
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
- restart|reload)
|
|
||||||
+ restart|reload|force-reload)
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
- condrestart)
|
|
||||||
+ condrestart|try-restart)
|
|
||||||
if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
@@ -60,7 +64,7 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
|
||||||
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
@ -1,72 +1,82 @@
|
|||||||
diff -up quagga-0.99.9/redhat/ospf6d.init.initscript quagga-0.99.9/redhat/ospf6d.init
|
diff -up quagga-0.99.16/redhat/bgpd.init.posix quagga-0.99.16/redhat/bgpd.init
|
||||||
--- quagga-0.99.9/redhat/ospf6d.init.initscript 2007-11-12 15:21:51.000000000 +0100
|
--- quagga-0.99.16/redhat/bgpd.init.posix 2010-03-17 14:11:26.681170285 +0100
|
||||||
+++ quagga-0.99.9/redhat/ospf6d.init 2007-11-12 15:33:15.000000000 +0100
|
+++ quagga-0.99.16/redhat/bgpd.init 2010-03-17 14:13:47.943170024 +0100
|
||||||
@@ -1,10 +1,11 @@
|
@@ -1,10 +1,12 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
-#
|
-#
|
||||||
+### BEGIN INIT INFO
|
-# chkconfig: 2345 16 84
|
||||||
+# Provides: ospf6d
|
-# description: A BGPv4, BGPv4+, BGPv4- routing engine for use with Zebra
|
||||||
# chkconfig: - 16 84
|
|
||||||
-# description: An OSPF routing engine for use with Zebra and IPv6
|
|
||||||
-#
|
-#
|
||||||
-# processname: ospf6d
|
-# processname: bgpd
|
||||||
# config: /etc/quagga/ospf6d.conf
|
-# config: /etc/zebra/bgpd.conf
|
||||||
+# Short-Description: A OSPF routing engine for IPv6
|
+# chkconfig: - 16 84
|
||||||
+# Description: An OSPF routing engine for use with Zebra and IPv6
|
+# config: /etc/quagga/bgpd.conf
|
||||||
|
+
|
||||||
|
+### BEGIN INIT INFO
|
||||||
|
+# Provides: bgpd
|
||||||
|
+# Short-Description: A BGPv4, BGPv4+, BGPv4- routing engine
|
||||||
|
+# Description: A BGPv4, BGPv4+, BGPv4- routing engine for use with Zebra
|
||||||
+### END INIT INFO
|
+### END INIT INFO
|
||||||
|
|
||||||
# source function library
|
# source function library
|
||||||
. /etc/rc.d/init.d/functions
|
. /etc/rc.d/init.d/functions
|
||||||
@@ -15,28 +16,31 @@
|
@@ -15,49 +17,57 @@
|
||||||
# quagga command line options
|
# quagga command line options
|
||||||
. /etc/sysconfig/quagga
|
. /etc/sysconfig/quagga
|
||||||
|
|
||||||
-# Check that networking is up.
|
-# Check that networking is up.
|
||||||
-[ "${NETWORKING_IPV6}" = "no" ] && exit 0
|
-[ "${NETWORKING}" = "no" ] && exit 0
|
||||||
-
|
-
|
||||||
-# The process must be configured first.
|
-# The process must be configured first.
|
||||||
-[ -f /etc/quagga/ospf6d.conf ] || exit 0
|
-[ -f /etc/quagga/bgpd.conf ] || exit 0
|
||||||
-
|
|
||||||
RETVAL=0
|
RETVAL=0
|
||||||
-prog="ospf6d"
|
-prog="bgpd"
|
||||||
+PROG="ospf6d"
|
+PROG="bgpd"
|
||||||
+cmd=ospf6d
|
+cmd=bgpd
|
||||||
+LOCK_FILE=/var/lock/subsys/ospf6d
|
+LOCK_FILE=/var/lock/subsys/bgpd
|
||||||
+CONF_FILE=/etc/quagga/ospf6d.conf
|
+CONF_FILE=/etc/quagga/bgpd.conf
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
- echo -n $"Starting $prog: "
|
- echo -n $"Starting $prog: "
|
||||||
- daemon /usr/sbin/ospf6d -d $OSPF6D_OPTS
|
- daemon /usr/sbin/bgpd -d $BGPD_OPTS
|
||||||
+ # Check that networking is up.
|
+ # Check that networking is up.
|
||||||
+ [ "${NETWORKING}" = "no" ] && exit 1
|
+ [ "${NETWORKING}" = "no" ] && exit 1
|
||||||
+
|
+
|
||||||
+ # The process must be configured first.
|
+ # The process must be configured first.
|
||||||
+ [ -f $CONF_FILE ] || exit 6
|
+ [ -f $CONF_FILE ] || exit 6
|
||||||
|
+ if [ `id -u` -ne 0 ]; then
|
||||||
|
+ echo $"Insufficient privilege" 1>&2
|
||||||
|
+ exit 4
|
||||||
|
+ fi
|
||||||
+
|
+
|
||||||
+ echo -n $"Starting $PROG: "
|
+ echo -n $"Starting $PROG: "
|
||||||
+ daemon $cmd -d $OSPF6D_OPTS
|
+ daemon $cmd -d $BGPD_OPTS
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ospf6d
|
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bgpd
|
||||||
+ [ $RETVAL -eq 0 ] && touch $LOCK_FILE
|
+ [ $RETVAL -eq 0 ] && touch $LOCK_FILE
|
||||||
echo
|
echo
|
||||||
;;
|
;;
|
||||||
stop)
|
stop)
|
||||||
- echo -n $"Shutting down $prog: "
|
- echo -n $"Shutting down $prog: "
|
||||||
- killproc ospf6d
|
- killproc bgpd
|
||||||
+ echo -n $"Shutting down $PROG: "
|
+ echo -n $"Shutting down $PROG: "
|
||||||
+ killproc $cmd
|
+ killproc $cmd
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ospf6d
|
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bgpd
|
||||||
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
||||||
echo
|
echo
|
||||||
;;
|
;;
|
||||||
restart|reload)
|
- restart|reload)
|
||||||
@@ -45,19 +49,19 @@ case "$1" in
|
+ restart|reload|force-reload)
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
condrestart)
|
- condrestart)
|
||||||
- if [ -f /var/lock/subsys/ospf6d ]; then
|
- if [ -f /var/lock/subsys/bgpd ]; then
|
||||||
|
+ condrestart|try-restart)
|
||||||
+ if [ -f $LOCK_FILE ]; then
|
+ if [ -f $LOCK_FILE ]; then
|
||||||
$0 stop
|
$0 stop
|
||||||
$0 start
|
$0 start
|
||||||
@ -74,38 +84,40 @@ diff -up quagga-0.99.9/redhat/ospf6d.init.initscript quagga-0.99.9/redhat/ospf6d
|
|||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
status)
|
status)
|
||||||
- status ospf6d
|
- status bgpd
|
||||||
+ status $cmd
|
+ status $cmd
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
- echo $"Usage: $prog {start|stop|restart|reload|condrestart|status}"
|
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
||||||
- exit 1
|
- exit 1
|
||||||
+ echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
|
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
|
||||||
+ exit 2
|
+ exit 2
|
||||||
esac
|
esac
|
||||||
|
|
||||||
exit $RETVAL
|
exit $RETVAL
|
||||||
diff -up quagga-0.99.9/redhat/isisd.init.initscript quagga-0.99.9/redhat/isisd.init
|
diff -up quagga-0.99.16/redhat/isisd.init.posix quagga-0.99.16/redhat/isisd.init
|
||||||
--- quagga-0.99.9/redhat/isisd.init.initscript 2007-11-12 15:21:51.000000000 +0100
|
--- quagga-0.99.16/redhat/isisd.init.posix 2010-03-17 14:11:26.704385156 +0100
|
||||||
+++ quagga-0.99.9/redhat/isisd.init 2007-11-12 15:21:51.000000000 +0100
|
+++ quagga-0.99.16/redhat/isisd.init 2010-03-17 14:13:47.943170024 +0100
|
||||||
@@ -1,10 +1,11 @@
|
@@ -1,40 +1,44 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
-#
|
-#
|
||||||
+### BEGIN INIT INFO
|
-# chkconfig: 2345 16 84
|
||||||
+# Provides: isisd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
-# description: An ISIS routing engine for use with Quagga
|
-# description: An ISIS routing engine for use with Quagga
|
||||||
-#
|
-#
|
||||||
-# processname: isisd
|
-# processname: isisd
|
||||||
|
+# chkconfig: - 16 84
|
||||||
# config: /etc/quagga/isisd.conf
|
# config: /etc/quagga/isisd.conf
|
||||||
+# Short-Description: An ISIS routing engine
|
|
||||||
+# description: An ISIS routing engine for use with Quagga
|
|
||||||
+### END INIT INFO
|
|
||||||
|
|
||||||
|
+### BEGIN INIT INFO
|
||||||
|
+# Provides: isisd
|
||||||
|
+# Short-Description: An ISIS routing engine
|
||||||
|
+# Description: An ISIS routing engine for use with Quagga
|
||||||
|
+### END INIT INFO
|
||||||
|
+
|
||||||
# source function library
|
# source function library
|
||||||
. /etc/rc.d/init.d/functions
|
. /etc/rc.d/init.d/functions
|
||||||
@@ -12,29 +13,31 @@
|
|
||||||
# Get network config
|
# Get network config
|
||||||
. /etc/sysconfig/network
|
. /etc/sysconfig/network
|
||||||
|
|
||||||
@ -151,7 +163,7 @@ diff -up quagga-0.99.9/redhat/isisd.init.initscript quagga-0.99.9/redhat/isisd.i
|
|||||||
echo
|
echo
|
||||||
;;
|
;;
|
||||||
restart|reload)
|
restart|reload)
|
||||||
@@ -43,19 +46,19 @@ case "$1" in
|
@@ -43,19 +47,19 @@ case "$1" in
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
condrestart)
|
condrestart)
|
||||||
@ -174,26 +186,127 @@ diff -up quagga-0.99.9/redhat/isisd.init.initscript quagga-0.99.9/redhat/isisd.i
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
exit $RETVAL
|
exit $RETVAL
|
||||||
diff -up quagga-0.99.9/redhat/ospfd.init.initscript quagga-0.99.9/redhat/ospfd.init
|
diff -up quagga-0.99.16/redhat/ospf6d.init.posix quagga-0.99.16/redhat/ospf6d.init
|
||||||
--- quagga-0.99.9/redhat/ospfd.init.initscript 2007-11-12 15:21:51.000000000 +0100
|
--- quagga-0.99.16/redhat/ospf6d.init.posix 2010-03-17 14:11:26.707387563 +0100
|
||||||
+++ quagga-0.99.9/redhat/ospfd.init 2007-11-12 15:32:50.000000000 +0100
|
+++ quagga-0.99.16/redhat/ospf6d.init 2010-03-17 14:13:47.944168987 +0100
|
||||||
@@ -1,10 +1,11 @@
|
@@ -1,11 +1,13 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
-#
|
-#
|
||||||
|
-# chkconfig: 2345 16 84
|
||||||
|
-# description: An OSPF routing engine for use with Zebra and IPv6
|
||||||
|
-#
|
||||||
|
-# processname: ospf6d
|
||||||
|
+# chkconfig: - 16 84
|
||||||
|
# config: /etc/quagga/ospf6d.conf
|
||||||
|
|
||||||
+### BEGIN INIT INFO
|
+### BEGIN INIT INFO
|
||||||
+# Provides: ospfd
|
+# Provides: ospf6d
|
||||||
# chkconfig: - 16 84
|
+# Short-Description: A OSPF routing engine for IPv6
|
||||||
|
+# Description: An OSPF routing engine for use with Zebra and IPv6
|
||||||
|
+### END INIT INFO
|
||||||
|
+
|
||||||
|
# source function library
|
||||||
|
. /etc/rc.d/init.d/functions
|
||||||
|
|
||||||
|
@@ -15,49 +17,56 @@
|
||||||
|
# quagga command line options
|
||||||
|
. /etc/sysconfig/quagga
|
||||||
|
|
||||||
|
-# Check that networking is up.
|
||||||
|
-[ "${NETWORKING_IPV6}" = "no" ] && exit 0
|
||||||
|
-
|
||||||
|
-# The process must be configured first.
|
||||||
|
-[ -f /etc/quagga/ospf6d.conf ] || exit 0
|
||||||
|
-
|
||||||
|
RETVAL=0
|
||||||
|
-prog="ospf6d"
|
||||||
|
+PROG="ospf6d"
|
||||||
|
+cmd=ospf6d
|
||||||
|
+LOCK_FILE=/var/lock/subsys/ospf6d
|
||||||
|
+CONF_FILE=/etc/quagga/ospf6d.conf
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
- echo -n $"Starting $prog: "
|
||||||
|
- daemon /usr/sbin/ospf6d -d $OSPF6D_OPTS
|
||||||
|
+ # Check that networking is up.
|
||||||
|
+ [ "${NETWORKING}" = "no" ] && exit 1
|
||||||
|
+
|
||||||
|
+ # The process must be configured first.
|
||||||
|
+ [ -f $CONF_FILE ] || exit 6
|
||||||
|
+ if [ `id -u` -ne 0 ]; then
|
||||||
|
+ echo $"Insufficient privilege" 1>&2
|
||||||
|
+ exit 4
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ echo -n $"Starting $PROG: "
|
||||||
|
+ daemon $cmd -d $OSPF6D_OPTS
|
||||||
|
RETVAL=$?
|
||||||
|
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ospf6d
|
||||||
|
+ [ $RETVAL -eq 0 ] && touch $LOCK_FILE
|
||||||
|
echo
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
- echo -n $"Shutting down $prog: "
|
||||||
|
- killproc ospf6d
|
||||||
|
+ echo -n $"Shutting down $PROG: "
|
||||||
|
+ killproc $cmd
|
||||||
|
RETVAL=$?
|
||||||
|
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ospf6d
|
||||||
|
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
||||||
|
echo
|
||||||
|
;;
|
||||||
|
- restart|reload)
|
||||||
|
+ restart|reload|force-reload)
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
- condrestart)
|
||||||
|
- if [ -f /var/lock/subsys/ospf6d ]; then
|
||||||
|
+ condrestart|try-restart)
|
||||||
|
+ if [ -f $LOCK_FILE ]; then
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
|
fi
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
- status ospf6d
|
||||||
|
+ status $cmd
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
- echo $"Usage: $prog {start|stop|restart|reload|condrestart|status}"
|
||||||
|
- exit 1
|
||||||
|
+ echo $"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
|
||||||
|
+ exit 2
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit $RETVAL
|
||||||
|
diff -up quagga-0.99.16/redhat/ospfd.init.posix quagga-0.99.16/redhat/ospfd.init
|
||||||
|
--- quagga-0.99.16/redhat/ospfd.init.posix 2010-03-17 14:11:26.709400924 +0100
|
||||||
|
+++ quagga-0.99.16/redhat/ospfd.init 2010-03-17 14:13:47.944168987 +0100
|
||||||
|
@@ -1,11 +1,13 @@
|
||||||
|
#!/bin/bash
|
||||||
|
-#
|
||||||
|
-# chkconfig: 2345 16 84
|
||||||
-# description: An OSPF v2 routing engine for use with Zebra
|
-# description: An OSPF v2 routing engine for use with Zebra
|
||||||
-#
|
-#
|
||||||
-# processname: ospfd
|
-# processname: ospfd
|
||||||
|
+# chkconfig: - 16 84
|
||||||
# config: /etc/quagga/ospfd.conf
|
# config: /etc/quagga/ospfd.conf
|
||||||
|
|
||||||
|
+### BEGIN INIT INFO
|
||||||
|
+# Provides: ospfd
|
||||||
+# Short-Description: A OSPF v2 routing engine
|
+# Short-Description: A OSPF v2 routing engine
|
||||||
+# Description: An OSPF v2 routing engine for use with Zebra
|
+# Description: An OSPF v2 routing engine for use with Zebra
|
||||||
+### END INIT INFO
|
+### END INIT INFO
|
||||||
|
+
|
||||||
# source function library
|
# source function library
|
||||||
. /etc/rc.d/init.d/functions
|
. /etc/rc.d/init.d/functions
|
||||||
@@ -15,29 +16,31 @@
|
|
||||||
|
@@ -15,50 +17,56 @@
|
||||||
# quagga command line options
|
# quagga command line options
|
||||||
. /etc/sysconfig/quagga
|
. /etc/sysconfig/quagga
|
||||||
|
|
||||||
@ -220,6 +333,10 @@ diff -up quagga-0.99.9/redhat/ospfd.init.initscript quagga-0.99.9/redhat/ospfd.i
|
|||||||
+
|
+
|
||||||
+ # The process must be configured first.
|
+ # The process must be configured first.
|
||||||
+ [ -f $CONF_FILE ] || exit 6
|
+ [ -f $CONF_FILE ] || exit 6
|
||||||
|
+ if [ `id -u` -ne 0 ]; then
|
||||||
|
+ echo $"Insufficient privilege" 1>&2
|
||||||
|
+ exit 4
|
||||||
|
+ fi
|
||||||
+
|
+
|
||||||
+ echo -n $"Starting $PROG: "
|
+ echo -n $"Starting $PROG: "
|
||||||
+ daemon $cmd -d $OSPFD_OPTS
|
+ daemon $cmd -d $OSPFD_OPTS
|
||||||
@ -238,12 +355,15 @@ diff -up quagga-0.99.9/redhat/ospfd.init.initscript quagga-0.99.9/redhat/ospfd.i
|
|||||||
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
||||||
echo
|
echo
|
||||||
;;
|
;;
|
||||||
restart|reload)
|
- restart|reload)
|
||||||
@@ -46,19 +49,19 @@ case "$1" in
|
+ restart|reload|force-reload)
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
condrestart)
|
- condrestart)
|
||||||
- if [ -f /var/lock/subsys/ospfd ]; then
|
- if [ -f /var/lock/subsys/ospfd ]; then
|
||||||
|
+ condrestart|try-restart)
|
||||||
+ if [ -f $LOCK_FILE ]; then
|
+ if [ -f $LOCK_FILE ]; then
|
||||||
$0 stop
|
$0 stop
|
||||||
$0 start
|
$0 start
|
||||||
@ -258,14 +378,210 @@ diff -up quagga-0.99.9/redhat/ospfd.init.initscript quagga-0.99.9/redhat/ospfd.i
|
|||||||
*)
|
*)
|
||||||
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
||||||
- exit 1
|
- exit 1
|
||||||
+ echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
|
+ echo $"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
|
||||||
+ exit 2
|
+ exit 2
|
||||||
esac
|
esac
|
||||||
|
|
||||||
exit $RETVAL
|
exit $RETVAL
|
||||||
diff -up quagga-0.99.9/redhat/watchquagga.init.initscript quagga-0.99.9/redhat/watchquagga.init
|
diff -up quagga-0.99.16/redhat/ripd.init.posix quagga-0.99.16/redhat/ripd.init
|
||||||
--- quagga-0.99.9/redhat/watchquagga.init.initscript 2004-12-22 04:02:46.000000000 +0100
|
--- quagga-0.99.16/redhat/ripd.init.posix 2010-03-17 14:11:26.711384881 +0100
|
||||||
+++ quagga-0.99.9/redhat/watchquagga.init 2007-11-12 15:21:51.000000000 +0100
|
+++ quagga-0.99.16/redhat/ripd.init 2010-03-17 14:13:47.944168987 +0100
|
||||||
|
@@ -1,11 +1,13 @@
|
||||||
|
#!/bin/bash
|
||||||
|
-#
|
||||||
|
-# chkconfig: 2345 16 84
|
||||||
|
-# description: A RIP routing engine for use with Zebra
|
||||||
|
-#
|
||||||
|
-# processname: ripd
|
||||||
|
+# chkconfig: - 16 84
|
||||||
|
# config: /etc/quagga/ripd.conf
|
||||||
|
|
||||||
|
+### BEGIN INIT INFO
|
||||||
|
+# Provides: ripd
|
||||||
|
+# Short-Description: A RIP routing engine
|
||||||
|
+# Description: A RIP routing engine for use with Zebra
|
||||||
|
+### END INIT INFO
|
||||||
|
+
|
||||||
|
# source function library
|
||||||
|
. /etc/rc.d/init.d/functions
|
||||||
|
|
||||||
|
@@ -15,49 +17,56 @@
|
||||||
|
# quagga command line options
|
||||||
|
. /etc/sysconfig/quagga
|
||||||
|
|
||||||
|
-# Check that networking is up.
|
||||||
|
-[ "${NETWORKING}" = "no" ] && exit 0
|
||||||
|
-
|
||||||
|
-# The process must be configured first.
|
||||||
|
-[ -f /etc/quagga/ripd.conf ] || exit 0
|
||||||
|
-
|
||||||
|
RETVAL=0
|
||||||
|
-prog="ripd"
|
||||||
|
+PROG="ripd"
|
||||||
|
+cmd=ripd
|
||||||
|
+LOCK_FILE=/var/lock/subsys/ripd
|
||||||
|
+CONF_FILE=/etc/quagga/ripd.conf
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
- echo -n $"Starting $prog: "
|
||||||
|
- daemon /usr/sbin/ripd -d $RIPD_OPTS
|
||||||
|
+ # Check that networking is up.
|
||||||
|
+ [ "${NETWORKING}" = "no" ] && exit 1
|
||||||
|
+
|
||||||
|
+ # The process must be configured first.
|
||||||
|
+ [ -f $CONF_FILE ] || exit 6
|
||||||
|
+ if [ `id -u` -ne 0 ]; then
|
||||||
|
+ echo $"Insufficient privilege" 1>&2
|
||||||
|
+ exit 4
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ echo -n $"Starting $PROG: "
|
||||||
|
+ daemon $cmd -d $RIPD_OPTS
|
||||||
|
RETVAL=$?
|
||||||
|
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ripd
|
||||||
|
+ [ $RETVAL -eq 0 ] && touch $LOCK_FILE
|
||||||
|
echo
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
- echo -n $"Shutting down $prog: "
|
||||||
|
- killproc ripd
|
||||||
|
+ echo -n $"Shutting down $PROG: "
|
||||||
|
+ killproc $cmd
|
||||||
|
RETVAL=$?
|
||||||
|
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ripd
|
||||||
|
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
||||||
|
echo
|
||||||
|
;;
|
||||||
|
- restart|reload)
|
||||||
|
+ restart|reload|force-reload)
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
- condrestart)
|
||||||
|
- if [ -f /var/lock/subsys/ripd ]; then
|
||||||
|
+ condrestart|try-restart)
|
||||||
|
+ if [ -f $LOCK_FILE ]; then
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
|
fi
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
- status ripd
|
||||||
|
+ status $cmd
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
||||||
|
- exit 1
|
||||||
|
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
|
||||||
|
+ exit 2
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit $RETVAL
|
||||||
|
diff -up quagga-0.99.16/redhat/ripngd.init.posix quagga-0.99.16/redhat/ripngd.init
|
||||||
|
--- quagga-0.99.16/redhat/ripngd.init.posix 2010-03-17 14:11:26.713385042 +0100
|
||||||
|
+++ quagga-0.99.16/redhat/ripngd.init 2010-03-17 14:13:47.945166204 +0100
|
||||||
|
@@ -1,11 +1,13 @@
|
||||||
|
#!/bin/bash
|
||||||
|
-#
|
||||||
|
-# chkconfig: 2345 16 84
|
||||||
|
-# description: A RIP routing engine for use with Zebra and IPv6
|
||||||
|
-#
|
||||||
|
-# processname: ripngd
|
||||||
|
+# chkconfig: - 16 84
|
||||||
|
# config: /etc/quagga/ripngd.conf
|
||||||
|
|
||||||
|
+### BEGIN INIT INFO
|
||||||
|
+# Provides: ripngd
|
||||||
|
+# Short-Description: A RIP routing engine for IPv6
|
||||||
|
+# Description: A RIP routing engine for use with Zebra and IPv6
|
||||||
|
+### END INIT INFO
|
||||||
|
+
|
||||||
|
# source function library
|
||||||
|
. /etc/rc.d/init.d/functions
|
||||||
|
|
||||||
|
@@ -15,49 +17,56 @@
|
||||||
|
# quagga command line options
|
||||||
|
. /etc/sysconfig/quagga
|
||||||
|
|
||||||
|
-# Check that networking is up.
|
||||||
|
-[ "${NETWORKING_IPV6}" = "no" ] && exit 0
|
||||||
|
-
|
||||||
|
-# The process must be configured first.
|
||||||
|
-[ -f /etc/quagga/ripngd.conf ] || exit 0
|
||||||
|
-
|
||||||
|
RETVAL=0
|
||||||
|
-prog="ripngd"
|
||||||
|
+PROG="ripngd"
|
||||||
|
+cmd=ripngd
|
||||||
|
+LOCK_FILE=/var/lock/subsys/ripngd
|
||||||
|
+CONF_FILE=/etc/quagga/ripngd.conf
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
- echo -n $"Starting $prog: "
|
||||||
|
- daemon /usr/sbin/ripngd -d $RIPNGD_OPTS
|
||||||
|
+ # Check that networking is up.
|
||||||
|
+ [ "${NETWORKING}" = "no" ] && exit 1
|
||||||
|
+
|
||||||
|
+ # The process must be configured first.
|
||||||
|
+ [ -f $CONF_FILE ] || exit 6
|
||||||
|
+ if [ `id -u` -ne 0 ]; then
|
||||||
|
+ echo $"Insufficient privilege" 1>&2
|
||||||
|
+ exit 4
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ echo -n $"Starting $PROG: "
|
||||||
|
+ daemon $cmd -d $RIPNGD_OPTS
|
||||||
|
RETVAL=$?
|
||||||
|
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ripngd
|
||||||
|
+ [ $RETVAL -eq 0 ] && touch $LOCK_FILE
|
||||||
|
echo
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
- echo -n $"Shutting down $prog: "
|
||||||
|
- killproc ripngd
|
||||||
|
+ echo -n $"Shutting down $PROG: "
|
||||||
|
+ killproc $cmd
|
||||||
|
RETVAL=$?
|
||||||
|
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ripngd
|
||||||
|
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
||||||
|
echo
|
||||||
|
;;
|
||||||
|
- restart|reload)
|
||||||
|
+ restart|reload|force-reload)
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
- condrestart)
|
||||||
|
- if [ -f /var/lock/subsys/ripngd ]; then
|
||||||
|
+ condrestart|try-restart)
|
||||||
|
+ if [ -f $LOCK_FILE ]; then
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
|
fi
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
- status ripngd
|
||||||
|
+ status $cmd
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
||||||
|
- exit 1
|
||||||
|
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
|
||||||
|
+ exit 2
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit $RETVAL
|
||||||
|
diff -up quagga-0.99.16/redhat/watchquagga.init.posix quagga-0.99.16/redhat/watchquagga.init
|
||||||
|
--- quagga-0.99.16/redhat/watchquagga.init.posix 2010-03-17 14:11:26.715399800 +0100
|
||||||
|
+++ quagga-0.99.16/redhat/watchquagga.init 2010-03-17 14:13:47.945166204 +0100
|
||||||
@@ -1,9 +1,10 @@
|
@@ -1,9 +1,10 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
-#
|
-#
|
||||||
@ -347,201 +663,28 @@ diff -up quagga-0.99.9/redhat/watchquagga.init.initscript quagga-0.99.9/redhat/w
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
exit $RETVAL
|
exit $RETVAL
|
||||||
diff -up quagga-0.99.9/redhat/bgpd.init.initscript quagga-0.99.9/redhat/bgpd.init
|
diff -up quagga-0.99.16/redhat/zebra.init.posix quagga-0.99.16/redhat/zebra.init
|
||||||
--- quagga-0.99.9/redhat/bgpd.init.initscript 2007-11-12 15:21:51.000000000 +0100
|
--- quagga-0.99.16/redhat/zebra.init.posix 2010-03-17 14:11:26.717385084 +0100
|
||||||
+++ quagga-0.99.9/redhat/bgpd.init 2007-11-12 15:21:51.000000000 +0100
|
+++ quagga-0.99.16/redhat/zebra.init 2010-03-17 14:13:47.945166204 +0100
|
||||||
@@ -1,10 +1,11 @@
|
@@ -1,64 +1,72 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
-#
|
-#
|
||||||
+### BEGIN INIT INFO
|
-# chkconfig: 2345 15 85
|
||||||
+# Provides: bgpd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
-# description: A BGPv4, BGPv4+, BGPv4- routing engine for use with Zebra
|
|
||||||
-#
|
|
||||||
-# processname: bgpd
|
|
||||||
-# config: /etc/zebra/bgpd.conf
|
|
||||||
+# config: /etc/quagga/bgpd.conf
|
|
||||||
+# Short-Description: A BGPv4, BGPv4+, BGPv4- routing engine
|
|
||||||
+# Description: A BGPv4, BGPv4+, BGPv4- routing engine for use with Zebra
|
|
||||||
+### END INIT INFO
|
|
||||||
|
|
||||||
# source function library
|
|
||||||
. /etc/rc.d/init.d/functions
|
|
||||||
@@ -15,28 +16,32 @@
|
|
||||||
# quagga command line options
|
|
||||||
. /etc/sysconfig/quagga
|
|
||||||
|
|
||||||
-# Check that networking is up.
|
|
||||||
-[ "${NETWORKING}" = "no" ] && exit 0
|
|
||||||
-
|
|
||||||
-# The process must be configured first.
|
|
||||||
-[ -f /etc/quagga/bgpd.conf ] || exit 0
|
|
||||||
|
|
||||||
RETVAL=0
|
|
||||||
-prog="bgpd"
|
|
||||||
+PROG="bgpd"
|
|
||||||
+cmd=bgpd
|
|
||||||
+LOCK_FILE=/var/lock/subsys/bgpd
|
|
||||||
+CONF_FILE=/etc/quagga/bgpd.conf
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
- echo -n $"Starting $prog: "
|
|
||||||
- daemon /usr/sbin/bgpd -d $BGPD_OPTS
|
|
||||||
+ # Check that networking is up.
|
|
||||||
+ [ "${NETWORKING}" = "no" ] && exit 1
|
|
||||||
+
|
|
||||||
+ # The process must be configured first.
|
|
||||||
+ [ -f $CONF_FILE ] || exit 6
|
|
||||||
+
|
|
||||||
+ echo -n $"Starting $PROG: "
|
|
||||||
+ daemon $cmd -d $BGPD_OPTS
|
|
||||||
RETVAL=$?
|
|
||||||
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bgpd
|
|
||||||
+ [ $RETVAL -eq 0 ] && touch $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
- echo -n $"Shutting down $prog: "
|
|
||||||
- killproc bgpd
|
|
||||||
+ echo -n $"Shutting down $PROG: "
|
|
||||||
+ killproc $cmd
|
|
||||||
RETVAL=$?
|
|
||||||
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bgpd
|
|
||||||
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
restart|reload)
|
|
||||||
@@ -45,19 +50,19 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
condrestart)
|
|
||||||
- if [ -f /var/lock/subsys/bgpd ]; then
|
|
||||||
+ if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
fi
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
- status bgpd
|
|
||||||
+ status $cmd
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
|
||||||
- exit 1
|
|
||||||
+ exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit $RETVAL
|
|
||||||
diff -up quagga-0.99.9/redhat/ripngd.init.initscript quagga-0.99.9/redhat/ripngd.init
|
|
||||||
--- quagga-0.99.9/redhat/ripngd.init.initscript 2007-11-12 15:21:51.000000000 +0100
|
|
||||||
+++ quagga-0.99.9/redhat/ripngd.init 2007-11-12 15:21:51.000000000 +0100
|
|
||||||
@@ -1,10 +1,11 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-#
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: ripngd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
-# description: A RIP routing engine for use with Zebra and IPv6
|
|
||||||
-#
|
|
||||||
-# processname: ripngd
|
|
||||||
# config: /etc/quagga/ripngd.conf
|
|
||||||
+# Short-Description: A RIP routing engine for IPv6
|
|
||||||
+# Description: A RIP routing engine for use with Zebra and IPv6
|
|
||||||
+### END INIT INFO
|
|
||||||
|
|
||||||
# source function library
|
|
||||||
. /etc/rc.d/init.d/functions
|
|
||||||
@@ -15,28 +16,31 @@
|
|
||||||
# quagga command line options
|
|
||||||
. /etc/sysconfig/quagga
|
|
||||||
|
|
||||||
-# Check that networking is up.
|
|
||||||
-[ "${NETWORKING_IPV6}" = "no" ] && exit 0
|
|
||||||
-
|
|
||||||
-# The process must be configured first.
|
|
||||||
-[ -f /etc/quagga/ripngd.conf ] || exit 0
|
|
||||||
-
|
|
||||||
RETVAL=0
|
|
||||||
-prog="ripngd"
|
|
||||||
+PROG="ripngd"
|
|
||||||
+cmd=ripngd
|
|
||||||
+LOCK_FILE=/var/lock/subsys/ripngd
|
|
||||||
+CONF_FILE=/etc/quagga/ripngd.conf
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
- echo -n $"Starting $prog: "
|
|
||||||
- daemon /usr/sbin/ripngd -d $RIPNGD_OPTS
|
|
||||||
+ # Check that networking is up.
|
|
||||||
+ [ "${NETWORKING}" = "no" ] && exit 1
|
|
||||||
+
|
|
||||||
+ # The process must be configured first.
|
|
||||||
+ [ -f $CONF_FILE ] || exit 6
|
|
||||||
+
|
|
||||||
+ echo -n $"Starting $PROG: "
|
|
||||||
+ daemon $cmd -d $RIPNGD_OPTS
|
|
||||||
RETVAL=$?
|
|
||||||
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ripngd
|
|
||||||
+ [ $RETVAL -eq 0 ] && touch $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
- echo -n $"Shutting down $prog: "
|
|
||||||
- killproc ripngd
|
|
||||||
+ echo -n $"Shutting down $PROG: "
|
|
||||||
+ killproc $cmd
|
|
||||||
RETVAL=$?
|
|
||||||
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ripngd
|
|
||||||
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
restart|reload)
|
|
||||||
@@ -45,19 +49,19 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
condrestart)
|
|
||||||
- if [ -f /var/lock/subsys/ripngd ]; then
|
|
||||||
+ if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
fi
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
- status ripngd
|
|
||||||
+ status $cmd
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
|
||||||
- exit 1
|
|
||||||
+ exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit $RETVAL
|
|
||||||
diff -up quagga-0.99.9/redhat/zebra.init.initscript quagga-0.99.9/redhat/zebra.init
|
|
||||||
--- quagga-0.99.9/redhat/zebra.init.initscript 2007-11-12 15:21:51.000000000 +0100
|
|
||||||
+++ quagga-0.99.9/redhat/zebra.init 2007-11-12 15:21:51.000000000 +0100
|
|
||||||
@@ -1,10 +1,11 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-#
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: zebra
|
|
||||||
# chkconfig: - 15 85
|
|
||||||
-# description: GNU Zebra routing manager
|
-# description: GNU Zebra routing manager
|
||||||
-#
|
-#
|
||||||
-# processname: zebra
|
-# processname: zebra
|
||||||
|
+# chkconfig: - 15 85
|
||||||
# config: /etc/quagga/zebra.conf
|
# config: /etc/quagga/zebra.conf
|
||||||
|
|
||||||
|
+### BEGIN INIT INFO
|
||||||
|
+# Provides: zebra
|
||||||
+# Short-Description: GNU Zebra routing manager
|
+# Short-Description: GNU Zebra routing manager
|
||||||
+# Description: GNU Zebra routing manager
|
+# Description: GNU Zebra routing manager
|
||||||
+### END INIT INFO
|
+### END INIT INFO
|
||||||
|
+
|
||||||
# source function library
|
# source function library
|
||||||
. /etc/rc.d/init.d/functions
|
. /etc/rc.d/init.d/functions
|
||||||
@@ -12,32 +13,34 @@
|
|
||||||
# quagga command line options
|
# quagga command line options
|
||||||
. /etc/sysconfig/quagga
|
. /etc/sysconfig/quagga
|
||||||
|
|
||||||
@ -567,6 +710,10 @@ diff -up quagga-0.99.9/redhat/zebra.init.initscript quagga-0.99.9/redhat/zebra.i
|
|||||||
+
|
+
|
||||||
+ # The process must be configured first.
|
+ # The process must be configured first.
|
||||||
+ [ -f $CONF_FILE ] || exit 6
|
+ [ -f $CONF_FILE ] || exit 6
|
||||||
|
+ if [ `id -u` -ne 0 ]; then
|
||||||
|
+ echo $"Insufficient privilege" 1>&2
|
||||||
|
+ exit 4
|
||||||
|
+ fi
|
||||||
+
|
+
|
||||||
+ echo -n $"Starting $PROG: "
|
+ echo -n $"Starting $PROG: "
|
||||||
|
|
||||||
@ -589,12 +736,15 @@ diff -up quagga-0.99.9/redhat/zebra.init.initscript quagga-0.99.9/redhat/zebra.i
|
|||||||
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
||||||
echo
|
echo
|
||||||
;;
|
;;
|
||||||
restart|reload)
|
- restart|reload)
|
||||||
@@ -46,19 +49,19 @@ case "$1" in
|
+ restart|reload|force-reload)
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
condrestart)
|
- condrestart)
|
||||||
- if [ -f /var/lock/subsys/zebra ]; then
|
- if [ -f /var/lock/subsys/zebra ]; then
|
||||||
|
+ condrestart|try-restart)
|
||||||
+ if [ -f $LOCK_FILE ]; then
|
+ if [ -f $LOCK_FILE ]; then
|
||||||
$0 stop
|
$0 stop
|
||||||
$0 start
|
$0 start
|
||||||
@ -607,95 +757,9 @@ diff -up quagga-0.99.9/redhat/zebra.init.initscript quagga-0.99.9/redhat/zebra.i
|
|||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
||||||
- exit 1
|
|
||||||
+ exit 2
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit $RETVAL
|
|
||||||
diff -up quagga-0.99.9/redhat/ripd.init.initscript quagga-0.99.9/redhat/ripd.init
|
|
||||||
--- quagga-0.99.9/redhat/ripd.init.initscript 2007-11-12 15:21:51.000000000 +0100
|
|
||||||
+++ quagga-0.99.9/redhat/ripd.init 2007-11-12 15:21:51.000000000 +0100
|
|
||||||
@@ -1,10 +1,11 @@
|
|
||||||
#!/bin/bash
|
|
||||||
-#
|
|
||||||
+### BEGIN INIT INFO
|
|
||||||
+# Provides: ripd
|
|
||||||
# chkconfig: - 16 84
|
|
||||||
-# description: A RIP routing engine for use with Zebra
|
|
||||||
-#
|
|
||||||
-# processname: ripd
|
|
||||||
# config: /etc/quagga/ripd.conf
|
|
||||||
+# Short-Description: A RIP routing engine
|
|
||||||
+# Description: A RIP routing engine for use with Zebra
|
|
||||||
+### END INIT INFO
|
|
||||||
|
|
||||||
# source function library
|
|
||||||
. /etc/rc.d/init.d/functions
|
|
||||||
@@ -15,28 +16,31 @@
|
|
||||||
# quagga command line options
|
|
||||||
. /etc/sysconfig/quagga
|
|
||||||
|
|
||||||
-# Check that networking is up.
|
|
||||||
-[ "${NETWORKING}" = "no" ] && exit 0
|
|
||||||
-
|
|
||||||
-# The process must be configured first.
|
|
||||||
-[ -f /etc/quagga/ripd.conf ] || exit 0
|
|
||||||
-
|
|
||||||
RETVAL=0
|
|
||||||
-prog="ripd"
|
|
||||||
+PROG="ripd"
|
|
||||||
+cmd=ripd
|
|
||||||
+LOCK_FILE=/var/lock/subsys/ripd
|
|
||||||
+CONF_FILE=/etc/quagga/ripd.conf
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
- echo -n $"Starting $prog: "
|
|
||||||
- daemon /usr/sbin/ripd -d $RIPD_OPTS
|
|
||||||
+ # Check that networking is up.
|
|
||||||
+ [ "${NETWORKING}" = "no" ] && exit 1
|
|
||||||
+
|
|
||||||
+ # The process must be configured first.
|
|
||||||
+ [ -f $CONF_FILE ] || exit 6
|
|
||||||
+
|
|
||||||
+ echo -n $"Starting $PROG: "
|
|
||||||
+ daemon $cmd -d $RIPD_OPTS
|
|
||||||
RETVAL=$?
|
|
||||||
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ripd
|
|
||||||
+ [ $RETVAL -eq 0 ] && touch $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
- echo -n $"Shutting down $prog: "
|
|
||||||
- killproc ripd
|
|
||||||
+ echo -n $"Shutting down $PROG: "
|
|
||||||
+ killproc $cmd
|
|
||||||
RETVAL=$?
|
|
||||||
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ripd
|
|
||||||
+ [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
|
|
||||||
echo
|
|
||||||
;;
|
|
||||||
restart|reload)
|
|
||||||
@@ -45,19 +49,19 @@ case "$1" in
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
condrestart)
|
|
||||||
- if [ -f /var/lock/subsys/ripd ]; then
|
|
||||||
+ if [ -f $LOCK_FILE ]; then
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
fi
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
- status ripd
|
|
||||||
+ status $cmd
|
|
||||||
RETVAL=$?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
|
|
||||||
- exit 1
|
- exit 1
|
||||||
|
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
|
||||||
+ exit 2
|
+ exit 2
|
||||||
esac
|
esac
|
||||||
|
|
||||||
27
quagga.spec
27
quagga.spec
@ -31,17 +31,15 @@
|
|||||||
|
|
||||||
Summary: Routing daemon
|
Summary: Routing daemon
|
||||||
Name: quagga
|
Name: quagga
|
||||||
Version: 0.99.15
|
Version: 0.99.16
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz
|
Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz
|
||||||
Source1: quagga-filter-perl-requires.sh
|
Source1: quagga-filter-perl-requires.sh
|
||||||
Patch2: quagga-0.96.5-nostart.patch
|
|
||||||
Patch7: quagga-0.99.9-initscript.patch
|
Patch1: quagga-0.99.15-perl_pth.patch
|
||||||
Patch8: quagga-0.99.15-posix.patch
|
Patch2: quagga-0.99.16-posix.patch
|
||||||
Patch9: quagga-0.99.15-lsbhdr.patch
|
|
||||||
Patch10: quagga-0.99.15-perl_pth.patch
|
|
||||||
|
|
||||||
URL: http://www.quagga.net
|
URL: http://www.quagga.net
|
||||||
%if %with_snmp
|
%if %with_snmp
|
||||||
@ -94,12 +92,9 @@ developing OSPF-API and quagga applications.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch2 -p1 -b .nostart
|
|
||||||
# This creates a .diff file that we apply after configuring
|
%patch1 -p1 -b .perl_pth
|
||||||
%patch7 -p1 -b .initscript
|
%patch2 -p1 -b .posix
|
||||||
%patch8 -p1 -b .posix
|
|
||||||
%patch9 -p1 -b .lsbhdr
|
|
||||||
%patch10 -p1 -b .perl_pth
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# FC5+ automatic -fstack-protector-all switch
|
# FC5+ automatic -fstack-protector-all switch
|
||||||
@ -353,6 +348,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 17 2010 Jiri Skala <jskala@redhat.com> - 0.99.16-1
|
||||||
|
- latest upstream version
|
||||||
|
- merged initscript patches
|
||||||
|
|
||||||
* Tue Jan 26 2010 Jiri Skala <jskala@redhat.com> - 0.99.15-2
|
* Tue Jan 26 2010 Jiri Skala <jskala@redhat.com> - 0.99.15-2
|
||||||
- changes in spec file and init scritps (#226352)
|
- changes in spec file and init scritps (#226352)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user