diff options
author | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-02-11 17:55:24 +0100 |
---|---|---|
committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-02-11 17:55:24 +0100 |
commit | 41d9cc6a6569e3a66f77a9cfd2869d209e665fa0 (patch) | |
tree | f7de1b136260d314a26b378156d7f94cf42e36a7 /redhat | |
parent | ripd: Fix crash when a default route is passed to rip (diff) | |
download | frr-41d9cc6a6569e3a66f77a9cfd2869d209e665fa0.tar.xz frr-41d9cc6a6569e3a66f77a9cfd2869d209e665fa0.zip |
quagga: remove babel
Ticket: CM-9274
Reviewed By: sharpd@cumulusnetworks.com
Testing Done:
<DETAILED DESCRIPTION (REPLACE)>
Diffstat (limited to 'redhat')
-rw-r--r-- | redhat/Makefile.am | 2 | ||||
-rw-r--r-- | redhat/babeld.init | 72 | ||||
-rw-r--r-- | redhat/babeld.service | 14 | ||||
-rw-r--r-- | redhat/quagga.logrotate | 8 | ||||
-rw-r--r-- | redhat/quagga.spec.in | 3 | ||||
-rw-r--r-- | redhat/quagga.sysconfig | 1 |
6 files changed, 2 insertions, 98 deletions
diff --git a/redhat/Makefile.am b/redhat/Makefile.am index c83e9591f..9612e9148 100644 --- a/redhat/Makefile.am +++ b/redhat/Makefile.am @@ -1,5 +1,5 @@ -EXTRA_DIST = babeld.init babeld.service bgpd.init bgpd.service isisd.init \ +EXTRA_DIST = bgpd.init bgpd.service isisd.init \ isisd.service ospf6d.init ospf6d.service ospfd.init ospfd.service \ quagga.logrotate quagga.pam quagga.pam.stack quagga.spec \ quagga.sysconfig ripd.init ripd.service ripngd.init ripngd.service \ diff --git a/redhat/babeld.init b/redhat/babeld.init deleted file mode 100644 index 76e8e5e08..000000000 --- a/redhat/babeld.init +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -# chkconfig: - 16 84 -# config: /etc/quagga/babeld.conf - -### BEGIN INIT INFO -# Provides: babeld -# Short-Description: Babel routing engine -# Description: Babel routing engine for use with Zebra -### END INIT INFO - -# source function library -. /etc/rc.d/init.d/functions - -# Get network config -. /etc/sysconfig/network - -# quagga command line options -. /etc/sysconfig/quagga - -RETVAL=0 -PROG="babeld" -cmd=babeld -LOCK_FILE=/var/lock/subsys/babeld -CONF_FILE=/etc/quagga/babeld.conf - -case "$1" in - start) - # 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 $BABELD_OPTS -f $CONF_FILE - RETVAL=$? - [ $RETVAL -eq 0 ] && touch $LOCK_FILE - echo - ;; - stop) - echo -n $"Shutting down $PROG: " - killproc $cmd - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE - echo - ;; - restart|reload|force-reload) - $0 stop - $0 start - RETVAL=$? - ;; - condrestart|try-restart) - if [ -f $LOCK_FILE ]; then - $0 stop - $0 start - fi - RETVAL=$? - ;; - status) - status $cmd - RETVAL=$? - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}" - exit 2 -esac - -exit $RETVAL diff --git a/redhat/babeld.service b/redhat/babeld.service deleted file mode 100644 index b1ea9432e..000000000 --- a/redhat/babeld.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Babel routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service -ConditionPathExists=/etc/quagga/babeld.conf - -[Service] -Type=forking -EnvironmentFile=/etc/sysconfig/quagga -ExecStart=/usr/sbin/babeld -d $BABELD_OPTS -f /etc/quagga/babeld.conf -Restart=on-abort - -[Install] -WantedBy=network.target diff --git a/redhat/quagga.logrotate b/redhat/quagga.logrotate index 9756a781a..afbd40c02 100644 --- a/redhat/quagga.logrotate +++ b/redhat/quagga.logrotate @@ -6,14 +6,6 @@ endscript } -/var/log/quagga/babeld.log { - notifempty - missingok - postrotate - /bin/kill -USR1 `cat /var/run/quagga/babeld.pid 2> /dev/null` 2> /dev/null || true - endscript -} - /var/log/quagga/bgpd.log { notifempty missingok diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in index 0ce25ca35..a9b031216 100644 --- a/redhat/quagga.spec.in +++ b/redhat/quagga.spec.in @@ -68,7 +68,7 @@ %define daemon_list zebra ripd ospfd bgpd %if %{with_ipv6} -%define daemonv6_list ripngd babeld ospf6d +%define daemonv6_list ripngd ospf6d %else %define daemonv6_list "" %endif @@ -406,7 +406,6 @@ rm -rf $RPM_BUILD_ROOT %if %{with_ipv6} %{_sbindir}/ripngd %{_sbindir}/ospf6d -%{_sbindir}/babeld %endif %if %{with_isisd} %{_sbindir}/isisd diff --git a/redhat/quagga.sysconfig b/redhat/quagga.sysconfig index 4d6ec5ad1..1621154bb 100644 --- a/redhat/quagga.sysconfig +++ b/redhat/quagga.sysconfig @@ -1,7 +1,6 @@ # # Default: Bind all daemon vtys to the loopback(s) only # -BABELD_OPTS="-A 127.0.0.1" BGPD_OPTS="-A 127.0.0.1" ISISD_OPTS="-A ::1" OSPF6D_OPTS="-A ::1" |