watchfrr: Rename watchquagga -> watchfrr

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

5 files changed, 51 insertions, 51 deletions

diff --git a/redhat/Makefile.am b/redhat/Makefile.am
index 96870689d..c70e71fef 100644
--- a/redhat/Makefile.am
+++ b/redhat/Makefile.am
@@ -3,6 +3,6 @@ EXTRA_DIST = bgpd.init isisd.init \
 	ospf6d.init ospfd.init ldpd.init \
 	quagga.logrotate quagga.pam quagga.spec \
 	quagga.sysconfig ripd.init ripngd.init  \
-	watchquagga.init pimd.init  zebra.init  \
+	watchfrr.init pimd.init  zebra.init  \
 	README.rpm_build.md
 
diff --git a/redhat/README.rpm_build.md b/redhat/README.rpm_build.md
index 05a0bdc59..c164d740b 100644
--- a/redhat/README.rpm_build.md
+++ b/redhat/README.rpm_build.md
@@ -59,7 +59,7 @@ Building your own Quagga RPM
 		%{!?quagga_user:       %global  quagga_user     quagga }
 		%{!?vty_group:         %global  vty_group       quaggavt }
 		%{!?with_fpm:          %global  with_fpm        0 }
-		%{!?with_watchquagga:  %global  with_watchquagga 1 }
+		%{!?with_watchfrr:  %global  with_watchfrr 1 }
 
 6. Build the RPM
 
@@ -84,11 +84,11 @@ Enabling daemons after installation of the package:
 		chkconfig bgpd on
 		... etc
 
-2. If you want to run `watchquagga`, then configure `/etc/sysconfig/quagga` 
-   and uncomment the line with the daemons for `watchquagga` to monitor,
-   then enable watchquagga
+2. If you want to run `watchfrr`, then configure `/etc/sysconfig/quagga` 
+   and uncomment the line with the daemons for `watchfrr` to monitor,
+   then enable watchfrr
 
-		chkconfig watchquagga on
+		chkconfig watchfrr on
 
 3. Check your firewall / IPtables to make sure the routing protocols are
 allowed.
@@ -113,7 +113,7 @@ Configuration is stored in `/etc/quagga/*.conf` files.
 		systemctl enable bgpd
 		... etc
 
-	Note: There is no watchquagga on systemd based systems. Systemd contains
+	Note: There is no watchfrr on systemd based systems. Systemd contains
 	the functionality of monitoring and restarting daemons.
 
 2. Check your firewall / IPtables to make sure the routing protocols are
diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 207889d92..752b70fca 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -23,7 +23,7 @@
 %{!?quagga_user:		%global	quagga_user		quagga }
 %{!?vty_group:			%global	vty_group		quaggavty }
 %{!?with_fpm:			%global	with_fpm 		0 }
-%{!?with_watchquagga:		%global	with_watchquagga 	1 }
+%{!?with_watchfrr:		%global	with_watchfrr 	1 }
 %{!?with_bgp_vnc:		%global	with_bgp_vnc 		0 }
 
 # path defines
@@ -52,13 +52,13 @@
 # Check for init.d (upstart) as used in CentOS 6 or systemd (ie CentOS 7)
 %{expand: %%global initsystem %(if [[ `/sbin/init --version 2> /dev/null` =~ upstart ]]; then echo upstart; elif [[ `systemctl` =~ -\.mount ]]; then echo systemd; fi)}
 #
-# If init system is systemd, then always disable watchquagga
+# If init system is systemd, then always disable watchfrr
 #
 %if "%{initsystem}" == "systemd"
-	# Note: For systems with systemd, watchquagga will NOT be built. Systemd
+	# Note: For systems with systemd, watchfrr will NOT be built. Systemd
 	# takes over the role of restarting crashed processes. Value will
 	# be overwritten with 0 below for systemd independent on the setting here
-	%global	with_watchquagga 1
+	%global	with_watchfrr 1
 %endif
 
 # if FPM is enabled, then enable tcp_zebra as well
@@ -80,13 +80,13 @@
 %define		daemon_ldpd	""
 %endif
 
-%if %{with_watchquagga}
-%define         daemon_watchquagga	watchquagga
+%if %{with_watchfrr}
+%define         daemon_watchfrr	watchfrr
 %else
-%define		daemon_watchquagga	""
+%define		daemon_watchfrr	""
 %endif
 
-%define		all_daemons	%{daemon_list} %{daemon_ldpd} %{daemon_watchquagga}
+%define		all_daemons	%{daemon_list} %{daemon_ldpd} %{daemon_watchfrr}
 
 # allow build dir to be kept
 %{!?keep_build:		%global		keep_build	0 }
@@ -232,10 +232,10 @@ developing OSPF-API and quagga applications.
 %else
 	--disable-fpm \
 %endif
-%if %{with_watchquagga}
-	--enable-watchquagga \
+%if %{with_watchfrr}
+	--enable-watchfrr \
 %else
-	--disable-watchquagga \
+	--disable-watchfrr \
 %endif
 %if %{with_bgp_vnc}
 	--enable-bgp-vnc \
@@ -371,9 +371,9 @@ for daemon in %{all_daemons} ; do
 		%endif
 	fi
 done
-%if %{with_watchquagga}
-	# No config for watchquagga - this is part of /etc/sysconfig/quagga
-	rm -f %{_sysconfdir}/watchquagga.*
+%if %{with_watchfrr}
+	# No config for watchfrr - this is part of /etc/sysconfig/quagga
+	rm -f %{_sysconfdir}/watchfrr.*
 %endif
 
 if [ ! -e %{_sysconfdir}/vtysh.conf ]; then
@@ -397,16 +397,16 @@ if [ "$1" -ge 1 ]; then
 	# Rename restart flags for daemons handled specially.
 	running_zebra="$restart_zebra"
 	restart_zebra=no
-	%if %{with_watchquagga}
-		running_watchquagga="$restart_watchquagga"
-		restart_watchquagga=no
+	%if %{with_watchfrr}
+		running_watchfrr="$restart_watchfrr"
+		restart_watchfrr=no
 	%endif
 	
 	%if "%{initsystem}" == "systemd"
 		##
 		## Systemd Version
 		##
-		# No watchquagga for systemd version
+		# No watchfrr for systemd version
 		#
 		# Stop all daemons other than zebra.
 		for daemon in %all_daemons ; do
@@ -427,12 +427,12 @@ if [ "$1" -ge 1 ]; then
 		##
 		## init.d Version
 		##
-		%if %{with_watchquagga}
-			# Stop watchquagga first.
-			[ "$running_watchquagga" = yes ] && \
-				/etc/rc.d/init.d/watchquagga stop >/dev/null 2>&1
+		%if %{with_watchfrr}
+			# Stop watchfrr first.
+			[ "$running_watchfrr" = yes ] && \
+				/etc/rc.d/init.d/watchfrr stop >/dev/null 2>&1
 		%endif
-		# Stop all daemons other than zebra and watchquagga.
+		# Stop all daemons other than zebra and watchfrr.
 		for daemon in %all_daemons ; do
 			eval restart=\$restart_${daemon}
 			[ "$restart" = yes ] && \
@@ -441,18 +441,18 @@ if [ "$1" -ge 1 ]; then
 		# Restart zebra.
 		[ "$running_zebra" = yes ] && \
 			/etc/rc.d/init.d/zebra restart >/dev/null 2>&1
-		# Start all daemons other than zebra and watchquagga.
+		# Start all daemons other than zebra and watchfrr.
 		for daemon in %all_daemons ; do
 			eval restart=\$restart_${daemon}
 			[ "$restart" = yes ] && \
 				/etc/rc.d/init.d/${daemon} start >/dev/null 2>&1
 		done
-		%if %{with_watchquagga}
-			# Start watchquagga last.
-			# Avoid postun scriptlet error if watchquagga is not running. 
-			[ "$running_watchquagga" = yes ] && \
-				/etc/rc.d/init.d/watchquagga start >/dev/null 2>&1 || :
-		%endif	
+		%if %{with_watchfrr}
+			# Start watchfrr last.
+			# Avoid postun scriptlet error if watchfrr is not running.
+			[ "$running_watchfrr" = yes ] && \
+				/etc/rc.d/init.d/watchfrr start >/dev/null 2>&1 || :
+		%endif
 	%endif
 fi
 
@@ -513,8 +513,8 @@ rm -rf %{buildroot}
 %{_sbindir}/quagga-reload.py
 %{_sbindir}/quagga-reload.pyc
 %{_sbindir}/quagga-reload.pyo
-%if %{with_watchquagga}
-	%{_sbindir}/watchquagga
+%if %{with_watchfrr}
+	%{_sbindir}/watchfrr
 %endif
 %{_sbindir}/ripngd
 %{_sbindir}/ospf6d
@@ -533,8 +533,8 @@ rm -rf %{buildroot}
 	%config %{_unitdir}/quagga.service
 %else
 	%config /etc/rc.d/init.d/zebra
-	%if %{with_watchquagga}
-		%config /etc/rc.d/init.d/watchquagga
+	%if %{with_watchfrr}
+		%config /etc/rc.d/init.d/watchfrr
 	%endif
 	%config /etc/rc.d/init.d/ripd
 	%config /etc/rc.d/init.d/ospfd
@@ -586,7 +586,7 @@ rm -rf %{buildroot}
 - Add conditional logic to only build tex footnotes with supported texi2html 
 - Added pimd to files section and fix double listing of /var/lib*/quagga
 - Numerous fixes to unify upstart/systemd startup into same spec file
-- Only allow use of watchquagga for non-systemd systems. no need with systemd
+- Only allow use of watchfrr for non-systemd systems. no need with systemd
 
 * Fri Sep  4 2015 Paul Jakma <paul@jakma.org>
 - buildreq updates
@@ -607,7 +607,7 @@ rm -rf %{buildroot}
 - daemonv6_list should contain only IPv6 daemons
 
 * Wed Dec 22 2004 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
-- watchquagga added
+- watchfrr added
 - on upgrade, all daemons should be condrestart'ed
 - on removal, all daemons should be stopped
 
diff --git a/redhat/quagga.sysconfig b/redhat/quagga.sysconfig
index 0cc6acfba..97c28c807 100644
--- a/redhat/quagga.sysconfig
+++ b/redhat/quagga.sysconfig
@@ -11,7 +11,7 @@ ZEBRA_OPTS="-A 127.0.0.1"
 PIMD_OPTS="-A 127.0.0.1"
 LDPD_OPTS="-A 127.0.0.1"
 
-# Watchquagga configuration for LSB initscripts
+# Watchfrr configuration for LSB initscripts
 #
 # (Not needed with systemd: the service files are configured to automatically
 # restart any daemon on failure. If zebra fails, all running daemons will be
diff --git a/redhat/watchquagga.init b/redhat/watchquagga.init
index dda350662..51259edc0 100644
--- a/redhat/watchquagga.init
+++ b/redhat/watchquagga.init
@@ -2,9 +2,9 @@
 # chkconfig: 2345 17 83
 
 ### BEGIN INIT INFO
-# Provides: watchquagga
-# Short-Description: Quagga watchdog
-# Description: Quagga watchdog for use with Zebra
+# Provides: watchfrr
+# Short-Description: Frr watchdog
+# Description: Frr watchdog for use with Zebra
 ### END INIT INFO
 
 # source function library
@@ -13,13 +13,13 @@
 # Get network config
 . /etc/sysconfig/network
 
-# quagga command line options
+# frr command line options
 . /etc/sysconfig/quagga
 
 RETVAL=0
-PROG="watchquagga"
-cmd=watchquagga
-LOCK_FILE=/var/lock/subsys/watchquagga
+PROG="watchfrr"
+cmd=watchfrr
+LOCK_FILE=/var/lock/subsys/watchfrr
 
 case "$1" in
   start)