*: fix "babeld: Remove babeld from Quagga" (336724d)
This removes some more bits of babeld, particularly from:
- buildtest.sh
- redhat/ build files
- vtysh integration (which actively broke the build)
The memtype and zclient/route type are kept in place since these don't
break anything and -theoretically- make it possible to build babeld
with some Quagga integration externally.
(Keeping vtysh integration is unfortunately not as easy.)
Reported-by: Donald Sharp <sharpd@cumulusnetworks.com>
Fixes: 336724d ("babeld: Remove babeld from Quagga")
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
Acked-by: Paul Jakma <paul@quagga.net>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/redhat/Makefile.am b/redhat/Makefile.am
index c83e959..9612e91 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 76e8e5e..0000000
--- 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 b1ea943..0000000
--- 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 9756a78..afbd40c 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 75835bb..43feea4 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
@@ -409,7 +409,6 @@
%if %{with_ipv6}
%{_sbindir}/ripngd
%{_sbindir}/ospf6d
-%{_sbindir}/babeld
%endif
%if %{with_isisd}
%{_sbindir}/isisd