proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-29 16:24:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #684 from donaldsharp/redhat_3.0

Browse Source 
Redhat 3.0
This commit is contained in:
Martin Winter 2017-06-06 17:35:27 -07:00 committed by GitHub
commit e0ce01d2fd
18 changed files with 958 additions and 1099 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
redhat/Makefile.am
View File

@ -1,8 +1,5 @@
EXTRA_DIST = bgpd.init isisd.init \ EXTRA_DIST = frr.init frr.service daemons \
ospf6d.init ospfd.init ldpd.init \
frr.logrotate frr.pam frr.spec \ frr.logrotate frr.pam frr.spec \
frr.sysconfig ripd.init ripngd.init \
watchfrr.init pimd.init zebra.init \
README.rpm_build.md README.rpm_build.md

106
redhat/README.rpm_build.md
View File

@ -1,31 +1,45 @@
Building your own FRRouting RPM Building your own FRRouting RPM
====================================== ======================================
(Tested on CentOS 6, CentOS 7 and Fedora 22.) (Tested on CentOS 6, CentOS 7 and Fedora 24.)
1. Install the following packages to build the RPMs: 1. On CentOS 6 (which doesn't provide a bison/automake/autoconf of a recent enough version):
- Check out ../doc/Building_FRR_on_CentOS6.md for details on installing
a bison/automake/autoconf to support frr building.
Newer automake/autoconf/bison is only needed to build the rpm and is
**not** needed to install the binary rpm package
2. Install the following packages to build the RPMs:
yum install git autoconf automake libtool make gawk readline-devel \ yum install git autoconf automake libtool make gawk readline-devel \
texinfo dejagnu net-snmp-devel groff rpm-build net-snmp-devel \ texinfo net-snmp-devel groff pkgconfig rpm-build json-c-devel \
libcap-devel texi2html pam-devel texi2html bison libcap-devel flex
Additionally, on systems with systemd (CentOS 7, Fedora)
yum install systemd-devel
(use `dnf install` on new Fedora instead of `yum install`) (use `dnf install` on new Fedora instead of `yum install`)
2. Checkout FRR under a **unpriviledged** user account **CentOS 6:** Please check doc/Building_FRR_on_CentOS6.md for details on
how to install required version of autoconf, automake and bison. The
versions in the common Repo are too old.
3. Checkout FRR under a **unpriviledged** user account
git clone https://github.com/frrouting/frr.git frr git clone https://github.com/frrouting/frr.git frr
3. Run Bootstrap and make distribution tar.gz 4. Run Bootstrap and make distribution tar.gz
cd frr cd frr
./bootstrap.sh ./bootstrap.sh
./configure --with-pkg-extra-version=-MyRPMVersion ./configure --with-pkg-extra-version=-MyRPMVersion
make dist make dist
Note: configure parameters are not important for the RPM building - except the Note: configure parameters are not important for the RPM building - except the `with-pkg-extra-version` if you want to give the RPM a specific name to
`with-pkg-extra-version` if you want to give the RPM a specific name to
mark your own unoffical build mark your own unoffical build
4. Create RPM directory structure and populate with sources 5. Create RPM directory structure and populate with sources
mkdir rpmbuild mkdir rpmbuild
mkdir rpmbuild/SOURCES mkdir rpmbuild/SOURCES
@ -33,42 +47,35 @@ Building your own FRRouting RPM
cp redhat/*.spec rpmbuild/SPECS/ cp redhat/*.spec rpmbuild/SPECS/
cp frr*.tar.gz rpmbuild/SOURCES/ cp frr*.tar.gz rpmbuild/SOURCES/
5. Edit rpm/SPECS/frr.spec with configuration as needed 6. Edit rpm/SPECS/frr.spec with configuration as needed
Look at the beginning of the file and adjust the following parameters to enable Look at the beginning of the file and adjust the following parameters to enable or disable features as required:
or disable features as required:
################# frr configure options #################### ############### FRRouting (FRR) configure options #################
# with-feature options # with-feature options
%{!?with_snmp: %global with_snmp 1 }
%{!?with_vtysh: %global with_vtysh 1 }
%{!?with_ospf_te: %global with_ospf_te 1 }
%{!?with_opaque_lsa: %global with_opaque_lsa 1 }
%{!?with_tcp_zebra: %global with_tcp_zebra 0 } %{!?with_tcp_zebra: %global with_tcp_zebra 0 }
%{!?with_vtysh: %global with_vtysh 1 } %{!?with_pam: %global with_pam 0 }
%{!?with_pam: %global with_pam 1 }
%{!?with_ospfclient: %global with_ospfclient 1 } %{!?with_ospfclient: %global with_ospfclient 1 }
%{!?with_ospfapi: %global with_ospfapi 1 } %{!?with_ospfapi: %global with_ospfapi 1 }
%{!?with_irdp: %global with_irdp 1 } %{!?with_irdp: %global with_irdp 1 }
%{!?with_rtadv: %global with_rtadv 1 } %{!?with_rtadv: %global with_rtadv 1 }
%{!?with_isisd: %global with_isisd 1 } %{!?with_ldpd: %global with_ldpd 1 }
%{!?with_pimd: %global with_pimd 1 }
%{!?with_mpls: %global with_mpls 0 }
%{!?with_ldpd: %global with_ldpd 0 }
%{!?with_shared: %global with_shared 1 } %{!?with_shared: %global with_shared 1 }
%{!?with_multipath: %global with_multipath 64 } %{!?with_multipath: %global with_multipath 256 }
%{!?frr_user: %global frr_user frr } %{!?frr_user: %global frr_user frr }
%{!?vty_group: %global vty_group frrvt } %{!?vty_group: %global vty_group frrvty }
%{!?with_fpm: %global with_fpm 0 } %{!?with_fpm: %global with_fpm 0 }
%{!?with_watchfrr: %global with_watchfrr 1 } %{!?with_watchfrr: %global with_watchfrr 1 }
%{!?with_bgp_vnc: %global with_bgp_vnc 0 }
%{!?with_pimd: %global with_pimd 1 }
6. Build the RPM 7. Build the RPM
rpmbuild --define "_topdir `pwd`/rpmbuild" -ba rpmbuild/SPECS/frr.spec rpmbuild --define "_topdir `pwd`/rpmbuild" -ba rpmbuild/SPECS/frr.spec
DONE. DONE.
If all works correctly, then you should end up with the RPMs under `rpmbuild/RPMS` If all works correctly, then you should end up with the RPMs under
and the Source RPM under `rpmbuild/SRPMS` `rpmbuild/RPMS` and the Source RPM under `rpmbuild/SRPMS`
Enabling daemons after installation of the package: Enabling daemons after installation of the package:
@ -76,55 +83,36 @@ Enabling daemons after installation of the package:
### init.d based systems (ie CentOS 6): ### init.d based systems (ie CentOS 6):
1. Enable the daemons as needed to run after boot (Zebra is mandatory) 1. Edit /etc/frr/daemons and enable required routing daemons (Zebra is probably needed for most deployments, so make sure to enable it.)
chkconfig zebra on 2. Enable the daemons as needed to run after boot (Zebra is mandatory)
chkconfig ospfd on
chkconfig ospf6d on
chkconfig bgpd on
... etc
2. If you want to run `watchfrr`, then configure `/etc/sysconfig/frr` chkconfig frr on
and uncomment the line with the daemons for `watchfrr` to monitor,
then enable watchfrr
chkconfig watchfrr on
3. Check your firewall / IPtables to make sure the routing protocols are 3. Check your firewall / IPtables to make sure the routing protocols are
allowed. allowed.
4. Start the daemons (or reboot) 5. Start the FRR daemons (or reboot)
service zebra start service frr start
service bgpd start
service ospfd start
... etc
Configuration is stored in `/etc/frr/*.conf` files. Configuration is stored in `/etc/frr/*.conf` files and daemon selection is stored in `/etc/frr/daemons`.
### systemd based systems (ie CentOS 7, Fedora 22) ### systemd based systems (ie CentOS 7, Fedora 24)
1. Enable the daemons as needed to run after boot (Zebra is mandatory) 1. Edit /etc/frr/daemons and enable required routing daemons (Zebra is probably needed for most deployments, so make sure to enable it.)
systemctl enable zebra 2. Enable the frr daemons to run after boot.
systemctl enable ospfd
systemctl enable ospf6d
systemctl enable bgpd
... etc
Note: There is no watchfrr on systemd based systems. Systemd contains systemctl enable frr
the functionality of monitoring and restarting daemons.
2. Check your firewall / IPtables to make sure the routing protocols are 2. Check your firewall / IPtables to make sure the routing protocols are
allowed. allowed.
3. Start the daemons (or reboot) 3. Start the daemons (or reboot)
systemctl start zebra systemctl start frr
systemctl start bgpd
systemctl start ospfd
... etc
Configuration is stored in `/etc/frr/*.conf` files. Configuration is stored in `/etc/frr/*.conf` files and daemon selection is stored in `/etc/frr/daemons`.

72
redhat/bgpd.init
View File

@ -1,72 +0,0 @@
#!/bin/bash
# chkconfig: - 16 84
# config: /etc/frr/bgpd.conf
### BEGIN INIT INFO
# Provides: bgpd
# Short-Description: BGP routing engine
# Description: BGP routing engine for use with Zebra
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="bgpd"
cmd=bgpd
LOCK_FILE=/var/lock/subsys/bgpd
CONF_FILE=/etc/frr/bgpd.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 $BGPD_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

59
redhat/daemons Normal file
View File

@ -0,0 +1,59 @@
# This file tells the frr package which daemons to start.
#
# Entries are in the format: <daemon>=(yes|no|priority)
# 0, "no" = disabled
# 1, "yes" = highest priority
# 2 .. 10 = lower priorities
#
# For daemons which support multiple instances, a 2nd line listing
# the instances can be added. Eg for ospfd:
# ospfd=yes
# ospfd_instances="1,2"
#
# Priorities were suggested by Dancer <dancer@zeor.simegen.com>.
# They're used to start the FRR daemons in more than one step
# (for example start one or two at network initialization and the
# rest later). The number of FRR daemons being small, priorities
# must be between 1 and 9, inclusive (or the initscript has to be
# changed). /etc/init.d/frr then can be started as
#
# /etc/init.d/frr <start|stop|restart|<priority>>
#
# where priority 0 is the same as 'stop', priority 10 or 'start'
# means 'start all'
#
# Sample configurations for these daemons can be found in
# /usr/share/doc/frr/examples/.
#
# ATTENTION:
#
# When activation a daemon at the first time, a config file, even if it is
# empty, has to be present *and* be owned by the user and group "frr", else
# the daemon will not be started by /etc/init.d/frr. The permissions should
# be u=rw,g=r,o=.
# When using "vtysh" such a config file is also needed. It should be owned by
# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
#
watchfrr_enable=no
watchfrr_options=("-Az" "-b_" "-r/etc/init.d/frr_restart_%s" "-s/etc/init.d/frr_start_%s" "-k/etc/init.d/frr_stop_%s")
#
zebra=no
bgpd=no
ospfd=no
ospf6d=no
ripd=no
ripngd=no
isisd=no
ldpd=no
#
# Command line options for the daemons
#
zebra_options=("-A 127.0.0.1")
bgpd_options=("-A 127.0.0.1")
ospfd_options=("-A 127.0.0.1")
ospf6d_options=("-A ::1")
ripd_options=("-A 127.0.0.1")
ripngd_options=("-A ::1")
isisd_options=("-A 127.0.0.1")
ldpd_options=("-A 127.0.0.1")

561
redhat/frr.init Executable file
View File

@ -0,0 +1,561 @@
#!/bin/bash
#
# /etc/rc.d/init.d/frr
#
# Start/Stop the FRR Routing daemons
# <any general comments about this init script>
#
# chkconfig: 2345 15 85
#
# description: FRRouting (FRR) is a routing suite for IP routing protocols
# like BGP, OSPF, RIP and others. This script contols the main
# daemon "frr" as well as the individual protocol daemons.
#
### BEGIN INIT INFO
# Provides: frr
# Required-Start: $local_fs $network $syslog
# Required-Stop: $local_fs $syslog
# Should-Start: $syslog
# Should-Stop: $network $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start/Stop the FRR Routing daemons
# Description: FRRouting (FRR) is a routing suite for IP routing protocols
# like BGP, OSPF, RIP and others. This script contols the main
# daemon "frr" as well as the individual protocol daemons.
### END INIT INFO
PATH=/bin:/usr/bin:/sbin:/usr/sbin
D_PATH=/usr/lib/frr
C_PATH=/etc/frr
V_PATH=/var/run/frr
# Local Daemon selection may be done by using /etc/frr/daemons.
# See /usr/share/doc/frr/README.Debian.gz for further information.
# Keep zebra first and do not list watchfrr!
DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd pimd ldpd"
MAX_INSTANCES=5
RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py
. /etc/init.d/functions
# Print the name of the pidfile.
pidfile()
{
echo "$V_PATH/$1.pid"
}
# Print the name of the vtysh.
vtyfile()
{
echo "$V_PATH/$1.vty"
}
# Check if daemon is started by using the pidfile.
started()
{
[ ! -e `pidfile $1` ] && return 3
if [ -n "$2" ] && [ "$2" == "log" ]; then
status -p `pidfile $1` $1 && return 0 || return $?
else
kill -0 `cat \`pidfile $1\`` 2> /dev/null || return 1
return 0
fi
}
# Loads the config via vtysh -b if configured to do so.
vtysh_b ()
{
# Rember, that all variables have been incremented by 1 in convert_daemon_prios()
if [ "$vtysh_enable" = 2 -a -f $C_PATH/frr.conf ]; then
/usr/bin/vtysh -b -n
fi
}
# Check if the daemon is activated and if its executable and config files
# are in place.
# params: daemon name
# returns: 0=ok, 1=error
check_daemon()
{
# If the integrated config file is used the others are not checked.
if [ -r "$C_PATH/frr.conf" ]; then
return 0
fi
# vtysh_enable has no config file nor binary so skip check.
# (Not sure why vtysh_enable is in this list but does not hurt)
if [ $1 != "watchfrr" -a $1 != "vtysh_enable" ]; then
# check for daemon binary
if [ ! -x "$D_PATH/$1" ]; then return 1; fi
# check for config file
if [ -n "$2" ]; then
if [ ! -r "$C_PATH/$1-$2.conf" ]; then
touch "$C_PATH/$1-$2.conf"
chown frr:frr "$C_PATH/$1-$2.conf"
fi
elif [ ! -r "$C_PATH/$1.conf" ]; then
touch "$C_PATH/$1.conf"
chown frr:frr "$C_PATH/$1.conf"
fi
fi
return 0
}
# Starts the server if it's not already running according to the pid file.
# The Frr daemons creates the pidfile when starting.
start()
{
ulimit -n $MAX_FDS > /dev/null 2> /dev/null
if [ "$1" = "watchfrr" ]; then
# We may need to restart watchfrr if new daemons are added and/or
# removed
if started "$1" ; then
stop watchfrr
else
# Echo only once. watchfrr is printed in the stop above
echo -n " $1"
fi
if [ -e /var/run/frr/watchfrr.started ] ; then
rm /var/run/frr/watchfrr.started
fi
daemon --pidfile=`pidfile $1` "$D_PATH/$1" -d "${watchfrr_options[@]}"
RETVAL=$?
[ $RETVAL -ne 0 ] && break
for i in `seq 1 10`;
do
if [ -e /var/run/frr/watchfrr.started ] ; then
RETVAL=0
break
else
sleep 1
fi
done
RETVAL=1
elif [ -n "$2" ]; then
echo -n " $1-$2"
if ! check_daemon $1 $2 ; then
echo -n " (binary does not exist)"
return;
fi
daemon --pidfile=`pidfile $1-$2` "$D_PATH/$1" -d `eval echo "$""$1""_options"` -n "$2"
RETVAL=$?
else
echo -n " $1 "
if ! check_daemon $1; then
echo " (binary does not exist)"
return;
fi
daemon --pidfile=`pidfile $1` "$D_PATH/$1" -d `eval echo "$""$1""_options"`
RETVAL=$?
fi
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$1
return $RETVAL
}
# Stop the daemon given in the parameter, printing its name to the terminal.
stop()
{
local inst
if [ -n "$2" ]; then
inst="$1-$2"
else
inst="$1"
fi
if ! started "$inst" ; then
# echo -n " ($inst)"
return 0
else
echo -n " $inst"
PIDFILE=`pidfile $inst`
PID=`cat $PIDFILE 2>/dev/null`
killproc -p "$PIDFILE" "$D_PATH/$1"
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f $lockfile
rm -f `pidfile $inst`
rm -f `vtyfile $inst`
echo
return $RETVAL
fi
}
# Converts values from /etc/frr/daemons to all-numeric values.
convert_daemon_prios()
{
for name in $DAEMONS zebra vtysh_enable watchfrr_enable; do
# First, assign the value set by the user to $value
eval value=\${${name}:0:3}
# Daemon not activated or entry missing?
if [ "$value" = "no" -o "$value" = "" ]; then value=0; fi
# These strings parsed for backwards compatibility.
if [ "$value" = "yes" -o "$value" = "true" ]; then
value=1;
fi
# Zebra is threatened special. It must be between 0=off and the first
# user assigned value "1" so we increase all other enabled daemons' values.
if [ "$name" != "zebra" -a "$value" -gt 0 ]; then value=`expr "$value" + 1`; fi
# If e.g. name is zebra then we set "zebra=yes".
eval $name=$value
done
}
# Starts watchfrr for all wanted daemons.
start_watchfrr()
{
local daemon_name
local daemon_prio
local found_one
local daemon_inst
# Start the monitor daemon only if desired.
if [ 0 -eq "$watchfrr_enable" ]; then
return
fi
# Check variable type
if ! declare -p watchfrr_options | grep -q '^declare \-a'; then
echo
echo "ERROR: The variable watchfrr_options from /etc/frr/daemons must be a BASH array!"
echo "ERROR: Please convert config file and restart!"
exit 1
fi
# Which daemons have been started?
found_one=0
for daemon_name in $DAEMONS; do
eval daemon_prio=\$$daemon_name
if [ "$daemon_prio" -gt 0 ]; then
eval "daemon_inst=\${${daemon_name}_instances//,/ }"
if [ -n "$daemon_inst" ]; then
for inst in ${daemon_inst}; do
eval "inst_disable=\${${daemon_name}_${inst}}"
if [ -z ${inst_disable} ] || [ ${inst_disable} != 0 ]; then
if check_daemon $daemon_name $inst; then
watchfrr_options+=("${daemon_name}-${inst}")
fi
fi
done
else
if check_daemon $daemon_name; then
watchfrr_options+=($daemon_name)
fi
fi
found_one=1
fi
done
# Start if at least one daemon is activated.
if [ $found_one -eq 1 ]; then
echo "Starting FRRouting monitor daemon:"
start watchfrr
fi
}
# Stopps watchfrr.
stop_watchfrr()
{
echo "Stopping FRRouting monitor daemon:"
stop watchfrr
}
# Stops all daemons that have a lower level of priority than the given.
# (technically if daemon_prio >= wanted_prio)
stop_prio()
{
local wanted_prio
local daemon_prio
local daemon_list
local daemon_inst
local inst
if [ -n "$2" ] && [[ "$2" =~ (.*)-(.*) ]]; then
daemon=${BASH_REMATCH[1]}
inst=${BASH_REMATCH[2]}
else
daemon="$2"
fi
wanted_prio=$1
daemon_list=${daemon:-$DAEMONS}
echo "Stopping FRRouting daemons (prio:$wanted_prio):"
for prio_i in `seq 10 -1 $wanted_prio`; do
for daemon_name in $daemon_list; do
eval daemon_prio=\${${daemon_name}:0:3}
daemon_inst=""
if [ $daemon_prio -eq $prio_i ]; then
eval "daemon_inst=\${${daemon_name}_instances//,/ }"
if [ -n "$daemon_inst" ]; then
for i in ${daemon_inst}; do
if [ -n "$inst" ] && [ "$i" == "$inst" ]; then
stop "$daemon_name" "$inst"
elif [ x"$inst" == x ]; then
stop "$daemon_name" "$i"
fi
done
else
stop "$daemon_name"
fi
fi
done
done
if [ -z "$inst" ]; then
# Now stop other daemons that're prowling, coz the daemons file changed
echo "Stopping other FRRouting daemons"
if [ -n "$daemon" ]; then
eval "file_list_suffix="$V_PATH"/"$daemon*""
else
eval "file_list_suffix="$V_PATH/*""
fi
for pidfile in $file_list_suffix.pid; do
if [ -f "$pidfile" ]; then
filename=${pidfile##*/}
daemon=${filename%.*}
echo -n " $daemon"
killproc -p "$pidfile" "$daemon"
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f $lockfile
rm -f "$pidfile"
echo
fi
done
echo -n "Removing remaining .vty files"
for vtyfile in $file_list_suffix.vty; do
rm -rf "$vtyfile"
done
echo
fi
}
# Starts all daemons that have a higher level of priority than the given.
# (technically if daemon_prio <= wanted_prio)
start_prio()
{
local wanted_prio
local daemon_prio
local daemon_list
local daemon_name
local daemon_inst
local inst
if [ -n "$2" ] && [[ "$2" =~ (.*)-(.*) ]]; then
daemon=${BASH_REMATCH[1]}
inst=${BASH_REMATCH[2]}
else
daemon="$2"
fi
wanted_prio=$1
daemon_list=${daemon:-$DAEMONS}
echo "Starting FRRouting daemons (prio:$wanted_prio):"
for prio_i in `seq 1 $wanted_prio`; do
for daemon_name in $daemon_list; do
eval daemon_prio=\$${daemon_name}
daemon_inst=""
if [ $daemon_prio -eq $prio_i ]; then
eval "daemon_inst=\${${daemon_name}_instances//,/ }"
if [ -n "$daemon_inst" ]; then
if [ `echo "$daemon_inst" | wc -w` -gt ${MAX_INSTANCES} ]; then
echo "Max instances supported is ${MAX_INSTANCES}. Aborting"
exit 1
fi
# Check if we're starting again by switching from single instance
# to MI version
if started "$daemon_name"; then
PIDFILE=`pidfile $daemon_name`
killproc -p "$PIDFILE" "$daemon_name"
rm -f `pidfile $1`
rm -f `vtyfile $1`
fi
for i in ${daemon_inst}; do
if [ -n "$inst" ] && [ "$i" == "$inst" ]; then
start "$daemon_name" "$inst"
elif [ x"$inst" == x ]; then
start "$daemon_name" "$i"
fi
done
else
# Check if we're starting again by switching from
# single instance to MI version
eval "file_list_suffix="$V_PATH"/"$daemon_name-*""
for pidfile in $file_list_suffix.pid; do
if [ -f "$pidfile" ]; then
killproc -p "$pidfile" "$daemon_name"
rm -rf "$pidfile"
fi
done
for vtyfile in $file_list_suffix.vty; do
rm -rf "$vtyfile"
done
start "$daemon_name"
fi
fi
done
done
}
check_status()
{
local daemon_name
local daemon_prio
local daemon_inst
local failed_status=0
if [ -n "$1" ] && [[ "$1" =~ (.*)-(.*) ]]; then
daemon=${BASH_REMATCH[1]}
inst=${BASH_REMATCH[2]}
else
daemon="$1"
fi
daemon_list=${daemon:-$DAEMONS}
# Which daemons have been started?
for daemon_name in $daemon_list; do
eval daemon_prio=\$$daemon_name
if [ "$daemon_prio" -gt 0 ]; then
eval "daemon_inst=\${${daemon_name}_instances//,/ }"
if [ -n "$daemon_inst" ]; then
for i in ${daemon_inst}; do
if [ -n "$inst" -a "$inst" = "$i" ]; then
started "$1" "log" || failed_status=$?
elif [ -z "$inst" ]; then
started "$daemon_name-$i" "log" || failed_status=$?
fi
done
else
started "$daemon_name" "log" || failed_status=$?
fi
fi
done
# All daemons that need to have been started are up and running
return $failed_status
}
#########################################################
# Main program #
#########################################################
# Config broken but script must exit silently.
[ ! -r "$C_PATH/daemons" ] && exit 0
# Load configuration
. "$C_PATH/daemons"
# Read configuration variable file if it is present
[ -r /etc/sysconfig/frr ] && . /etc/sysconfig/frr
MAX_INSTANCES=${MAX_INSTANCES:=5}
# Set priority of un-startable daemons to 'no' and substitute 'yes' to '0'
convert_daemon_prios
if [ ! -d $V_PATH ]; then
echo "Creating $V_PATH"
mkdir -p $V_PATH
chown frr:frr $V_PATH
chmod 755 /$V_PATH
fi
if [ -n "$3" ] && [ "$3" != "all" ]; then
dmn="$2"-"$3"
elif [ -n "$2" ] && [ "$2" != "all" ]; then
dmn="$2"
fi
case "$1" in
start)
# Try to load this necessary (at least for 2.6) module.
if [ -d /lib/modules/`uname -r` ] ; then
echo "Loading capability module if not yet done."
LC_ALL=C modprobe -a capability 2>&1 | egrep -v "(not found|Can't locate)"
fi
# Start all daemons
cd $C_PATH/
if [ "$2" != "watchfrr" ]; then
start_prio 10 $dmn
fi
start_watchfrr
vtysh_b
;;
1|2|3|4|5|6|7|8|9|10)
# Stop/start daemons for the appropriate priority level
stop_prio $1
start_prio $1
vtysh_b
;;
stop|0)
# Stop all daemons at level '0' or 'stop'
stop_watchfrr
if [ "$dmn" != "watchfrr" ]; then
[ -n "${dmn}" ] && eval "${dmn/-/_}=0"
stop_prio 0 $dmn
fi
if [ -z "$dmn" -o "$dmn" = "zebra" ]; then
echo "Removing all routes made by zebra."
ip route flush proto zebra
else
[ -n "$dmn" ] && eval "${dmn/-/_}=0"
start_watchfrr
fi
;;
reload)
# Just apply the commands that have changed, no restart necessary
if [ ! -x "$RELOAD_SCRIPT" ]; then
echo "frr-reload - reload not supported. Use restart or install frr-pythontools package"
exit 1
fi
NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}"
if [ ! -r $NEW_CONFIG_FILE ]; then
echo "Unable to read configuration file $NEW_CONFIG_FILE. Only supporting integrated config"
exit 1
fi
echo "Applying only incremental changes to running configuration from frr.conf"
"$RELOAD_SCRIPT" --reload /etc/frr/frr.conf
exit $?
;;
status)
check_status $dmn
exit $?
;;
restart|force-reload)
$0 stop $dmn
sleep 1
$0 start $dmn
;;
*)
echo "Usage: /etc/init.d/frr {start|stop|status|reload|restart|force-reload|<priority>} [daemon]"
echo " E.g. '/etc/init.d/frr 5' would start all daemons with a prio 1-5."
echo " reload applies only modifications from the running config to all daemons."
echo " reload neither restarts starts any daemon nor starts any new ones."
echo " Read /usr/share/doc/frr/README.Debian for details."
exit 1
;;
esac
exit 0

23
redhat/frr.service Normal file
View File

@ -0,0 +1,23 @@
[Unit]
Description=FRRouting (FRR)
After=syslog.target networking.service
OnFailure=heartbeat-failed@%n.service
[Service]
Nice=-5
Type=forking
NotifyAccess=all
StartLimitInterval=3m
StartLimitBurst=3
TimeoutSec=1m
WatchdogSec=60s
RestartSec=5
Restart=on-abnormal
LimitNOFILE=1024
ExecStart=/usr/lib/frr/frr start
ExecStop=/usr/lib/frr/frr stop
ExecReload=/usr/lib/frr/frr reload
[Install]
WantedBy=network-online.target

227
redhat/frr.spec.in
View File

@ -8,7 +8,7 @@
# rpms again and again on the same day, so the newer rpms can be installed. # rpms again and again on the same day, so the newer rpms can be installed.
# bumping the number each time. # bumping the number each time.
####################### FRRouting (FRR) configure options ######################### #################### FRRouting (FRR) configure options #####################
# with-feature options # with-feature options
%{!?with_tcp_zebra: %global with_tcp_zebra 0 } %{!?with_tcp_zebra: %global with_tcp_zebra 0 }
%{!?with_pam: %global with_pam 0 } %{!?with_pam: %global with_pam 0 }
@ -16,7 +16,6 @@
%{!?with_ospfapi: %global with_ospfapi 1 } %{!?with_ospfapi: %global with_ospfapi 1 }
%{!?with_irdp: %global with_irdp 1 } %{!?with_irdp: %global with_irdp 1 }
%{!?with_rtadv: %global with_rtadv 1 } %{!?with_rtadv: %global with_rtadv 1 }
%{!?with_mpls: %global with_mpls 0 }
%{!?with_ldpd: %global with_ldpd 0 } %{!?with_ldpd: %global with_ldpd 0 }
%{!?with_nhrpd: %global with_nhrpd 1 } %{!?with_nhrpd: %global with_nhrpd 1 }
%{!?with_shared: %global with_shared 1 } %{!?with_shared: %global with_shared 1 }
@ -26,6 +25,7 @@
%{!?with_fpm: %global with_fpm 0 } %{!?with_fpm: %global with_fpm 0 }
%{!?with_watchfrr: %global with_watchfrr 1 } %{!?with_watchfrr: %global with_watchfrr 1 }
%{!?with_bgp_vnc: %global with_bgp_vnc 0 } %{!?with_bgp_vnc: %global with_bgp_vnc 0 }
%{!?with_pimd: %global with_pimd 1 }
# path defines # path defines
%define _sysconfdir /etc/frr %define _sysconfdir /etc/frr
@ -34,7 +34,6 @@
%define zeb_rh_src %{zeb_src}/redhat %define zeb_rh_src %{zeb_src}/redhat
%define zeb_docs %{zeb_src}/doc %define zeb_docs %{zeb_src}/doc
%define frr_tools %{zeb_src}/tools %define frr_tools %{zeb_src}/tools
%define cumulus_dir %{zeb_src}/cumulus/etc
# defines for configure # defines for configure
%define _localstatedir /var/run/frr %define _localstatedir /var/run/frr
@ -47,11 +46,11 @@
#### Check version of texi2html #### Check version of texi2html
# Old versions don't support "--number-footnotes" option. # Old versions don't support "--number-footnotes" option.
%{expand: %%global texi2htmlversion %(/usr/bin/texi2html --version | cut -d. -f1)} %{expand: %%global texi2htmlversion %(if [[ -f /usr/bin/texi2html ]]; then /usr/bin/texi2html --version | cut -d. -f1; else echo 0; fi)}
#### Check for systemd or init.d (upstart) #### Check for systemd or init.d (upstart)
# Check for init.d (upstart) as used in CentOS 6 or systemd (ie CentOS 7) # 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)} %{expand: %%global initsystem %(if [[ `/sbin/init --version 2> /dev/null` =~ upstart ]]; then echo upstart; elif [[ `file /sbin/init` =~ "symbolic link to \`../lib/systemd/systemd'" ]]; then echo systemd; elif [[ `systemctl` =~ -\.mount ]]; then echo systemd; fi)}
# #
# If init system is systemd, then always disable watchfrr # If init system is systemd, then always disable watchfrr
# #
@ -62,6 +61,15 @@
%global with_watchfrr 1 %global with_watchfrr 1
%endif %endif
#### Check for RedHat 6.x or CentOS 6.x - they are too old to support PIM.
#### Always disable it on these old systems unconditionally
%{expand: %%global redhat6 %(if [[ `cat /etc/redhat-release 2> /dev/null` =~ release\ 6\. ]]; then echo 6; else echo 0; fi)}
#
# if CentOS 6 / RedHat 6, then disable PIMd
%if "%{redhat6}" == "6"
%global with_pimd 0
%endif
# if FPM is enabled, then enable tcp_zebra as well # if FPM is enabled, then enable tcp_zebra as well
# #
%if %{with_fpm} %if %{with_fpm}
@ -73,7 +81,7 @@
%{!?frr_gid: %global frr_gid 92 } %{!?frr_gid: %global frr_gid 92 }
%{!?vty_gid: %global vty_gid 85 } %{!?vty_gid: %global vty_gid 85 }
%define daemon_list zebra ripd ospfd bgpd isisd pimd ripngd ospf6d %define daemon_list zebra ripd ospfd bgpd isisd ripngd ospf6d
%if %{with_ldpd} %if %{with_ldpd}
%define daemon_ldpd ldpd %define daemon_ldpd ldpd
@ -81,6 +89,12 @@
%define daemon_ldpd "" %define daemon_ldpd ""
%endif %endif
%if %{with_pimd}
%define daemon_pimd pimd
%else
%define daemon_pimd ""
%endif
%if %{with_nhrpd} %if %{with_nhrpd}
%define daemon_nhrpd nhrpd %define daemon_nhrpd nhrpd
%else %else
@ -93,7 +107,7 @@
%define daemon_watchfrr "" %define daemon_watchfrr ""
%endif %endif
%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_nhrpd} %{daemon_watchfrr} %define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_nhrpd} %{daemon_pimd} %{daemon_watchfrr}
# allow build dir to be kept # allow build dir to be kept
%{!?keep_build: %global keep_build 0 } %{!?keep_build: %global keep_build 0 }
@ -109,20 +123,19 @@ License: GPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
Source0: http://www.frrouting.org/releases/frr/%{name}-%{frrversion}.tar.gz Source0: http://www.frrouting.org/releases/frr/%{name}-%{frrversion}.tar.gz
URL: http://www.frrouting.org URL: http://www.frrouting.org
Requires: ncurses json-c
Requires(pre): /sbin/install-info Requires(pre): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
BuildRequires: texi2html texinfo autoconf patch libcap-devel groff BuildRequires: gcc texi2html texinfo patch libcap-devel groff
BuildRequires: readline readline-devel ncurses ncurses-devel BuildRequires: readline readline-devel ncurses ncurses-devel
BuildRequires: json-c-devel bison flex BuildRequires: json-c-devel bison >= 2.7 flex make
Requires: ncurses initscripts Requires: ncurses json-c initscripts
%if %{with_pam} %if %{with_pam}
BuildRequires: pam-devel BuildRequires: pam-devel
Requires: pam Requires: pam
%endif %endif
%if "%{initsystem}" == "systemd" %if "%{initsystem}" == "systemd"
BuildRequires: systemd BuildRequires: systemd systemd-devel
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
@ -151,6 +164,15 @@ Group: System Environment/Daemons
%description contrib %description contrib
Contributed/3rd party tools which may be of use with frr. Contributed/3rd party tools which may be of use with frr.
%package pythontools
Summary: python tools for frr
BuildRequires: python
Requires: python python-ipaddr
Group: System Environment/Daemons
%description pythontools
Contributed python 2.7 tools which may be of use with frr.
%package devel %package devel
Summary: Header and object files for frr development Summary: Header and object files for frr development
Group: System Environment/Daemons Group: System Environment/Daemons
@ -193,9 +215,9 @@ developing OSPF-API and frr applications.
%endif %endif
--enable-vtysh \ --enable-vtysh \
%if %{with_ospfclient} %if %{with_ospfclient}
--enable-ospfclient=yes \ --enable-ospfclient \
%else %else
--enable-ospfclient=no\ --disable-ospfclient\
%endif %endif
%if %{with_ospfapi} %if %{with_ospfapi}
--enable-ospfapi=yes \ --enable-ospfapi=yes \
@ -212,11 +234,6 @@ developing OSPF-API and frr applications.
%else %else
--enable-rtadv=no \ --enable-rtadv=no \
%endif %endif
%if %{with_mpls}
--enable-mpls=yes \
%else
--disable-mpls \
%endif
%if %{with_ldpd} %if %{with_ldpd}
--enable-ldpd \ --enable-ldpd \
%else %else
@ -227,6 +244,11 @@ developing OSPF-API and frr applications.
%else %else
--disable-nhrpd \ --disable-nhrpd \
%endif %endif
%if %{with_pimd}
--enable-pimd \
%else
--disable-pimd \
%endif
%if %{with_pam} %if %{with_pam}
--with-libpam \ --with-libpam \
%endif %endif
@ -254,7 +276,9 @@ developing OSPF-API and frr applications.
%endif %endif
--enable-gcc-rdynamic \ --enable-gcc-rdynamic \
--enable-isisd=yes \ --enable-isisd=yes \
%if "%{initsystem}" == "systemd"
--enable-systemd=yes \ --enable-systemd=yes \
%endif
--enable-poll=yes --enable-poll=yes
make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
@ -275,25 +299,23 @@ make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install
# Remove this file, as it is uninstalled and causes errors when building on RH9 # Remove this file, as it is uninstalled and causes errors when building on RH9
rm -rf %{buildroot}/usr/share/info/dir rm -rf %{buildroot}/usr/share/info/dir
# Remove debian init script if it was installed
rm -f %{buildroot}%{_sbindir}/frr
# install /etc sources # install /etc sources
%if "%{initsystem}" == "systemd" %if "%{initsystem}" == "systemd"
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install %{frr_tools}/frr.service \ install %{zeb_rh_src}/frr.service \
%{buildroot}%{_unitdir}/frr.service %{buildroot}%{_unitdir}/frr.service
install %{zeb_rh_src}/frr.init \
%{buildroot}%{_sbindir}/frr
%else %else
mkdir -p %{buildroot}/etc/rc.d/init.d mkdir -p %{buildroot}/etc/rc.d/init.d
for daemon in %{all_daemons} ; do install %{zeb_rh_src}/frr.init \
if [ x"${daemon}" != x"" ] ; then %{buildroot}/etc/rc.d/init.d/frr
install %{zeb_rh_src}/${daemon}.init \
%{buildroot}/etc/rc.d/init.d/${daemon}
fi
done
%endif %endif
install %{cumulus_dir}/frr/debian.conf %{buildroot}/etc/frr install %{zeb_rh_src}/daemons %{buildroot}/etc/frr
install %{cumulus_dir}/frr/daemons %{buildroot}/etc/frr
install -m644 %{cumulus_dir}/default/frr %{buildroot}/etc/default
install -m644 %{zeb_rh_src}/frr.pam \ install -m644 %{zeb_rh_src}/frr.pam \
%{buildroot}/etc/pam.d/frr %{buildroot}/etc/pam.d/frr
install -m644 %{zeb_rh_src}/frr.logrotate \ install -m644 %{zeb_rh_src}/frr.logrotate \
@ -351,7 +373,9 @@ zebra_spec_add_service isisd 2608/tcp "ISISd vty"
%if %{with_nhrpd} %if %{with_nhrpd}
zebra_spec_add_service nhrpd 2610/tcp "NHRPd vty" zebra_spec_add_service nhrpd 2610/tcp "NHRPd vty"
%endif %endif
%if %{with_pimd}
zebra_spec_add_service pimd 2611/tcp "PIMd vty" zebra_spec_add_service pimd 2611/tcp "PIMd vty"
%endif
%if %{with_ldpd} %if %{with_ldpd}
zebra_spec_add_service ldpd 2612/tcp "LDPd vty" zebra_spec_add_service ldpd 2612/tcp "LDPd vty"
%endif %endif
@ -361,9 +385,7 @@ for daemon in %all_daemons ; do
%systemd_post frr.service %systemd_post frr.service
done done
%else %else
for daemon in %all_daemons ; do /sbin/chkconfig --add frr
/sbin/chkconfig --add ${daemon}
done
%endif %endif
/sbin/install-info %{_infodir}/frr.info.gz %{_infodir}/dir /sbin/install-info %{_infodir}/frr.info.gz %{_infodir}/dir
@ -374,16 +396,22 @@ if [ ! -e %{_sysconfdir}/zebra.conf ]; then
%if 0%{?frr_user:1} %if 0%{?frr_user:1}
chown %frr_user:%frr_user %{_sysconfdir}/zebra.conf* chown %frr_user:%frr_user %{_sysconfdir}/zebra.conf*
%endif %endif
chmod 640 %{_sysconfdir}/zebra.conf chmod 640 %{_sysconfdir}/zebra.conf*
fi fi
for daemon in %{all_daemons} ; do for daemon in %{all_daemons} ; do
if [ x"${daemon}" != x"" ] ; then
if [ ! -e %{_sysconfdir}/${daemon}.conf ]; then if [ ! -e %{_sysconfdir}/${daemon}.conf ]; then
touch %{_sysconfdir}/${daemon}.conf touch %{_sysconfdir}/${daemon}.conf
%if 0%{?frr_user:1} %if 0%{?frr_user:1}
chown %frr_user:%frr_user %{_sysconfdir}/${daemon}.conf* chown %frr_user:%frr_user %{_sysconfdir}/${daemon}.conf*
%endif %endif
fi fi
fi
done done
%if 0%{?frr_user:1}
chown %frr_user:%frr_user %{_sysconfdir}/daemons
%endif
%if %{with_watchfrr} %if %{with_watchfrr}
# No config for watchfrr - this is part of /etc/sysconfig/frr # No config for watchfrr - this is part of /etc/sysconfig/frr
rm -f %{_sysconfdir}/watchfrr.* rm -f %{_sysconfdir}/watchfrr.*
@ -392,80 +420,28 @@ done
if [ ! -e %{_sysconfdir}/vtysh.conf ]; then if [ ! -e %{_sysconfdir}/vtysh.conf ]; then
touch %{_sysconfdir}/vtysh.conf touch %{_sysconfdir}/vtysh.conf
chmod 640 %{_sysconfdir}/vtysh.conf chmod 640 %{_sysconfdir}/vtysh.conf
%if 0%{?frr_user:1}
%if 0%{?vty_group:1} %if 0%{?vty_group:1}
chown frr:%{vty_group} %{_sysconfdir}/vtysh.conf* chown %{frr_user}:%{vty_group} %{_sysconfdir}/vtysh.conf*
%endif
%endif %endif
fi fi
%postun %postun
if [ "$1" -ge 1 ]; then if [ "$1" -ge 1 ]; then
# Find out which daemons need to be restarted. #
for daemon in %all_daemons ; do # Upgrade from older version
if [ -f /var/lock/subsys/${daemon} ]; then #
eval restart_${daemon}=yes
else
eval restart_${daemon}=no
fi
done
# Rename restart flags for daemons handled specially.
running_zebra="$restart_zebra"
restart_zebra=no
%if %{with_watchfrr}
running_watchfrr="$restart_watchfrr"
restart_watchfrr=no
%endif
%if "%{initsystem}" == "systemd" %if "%{initsystem}" == "systemd"
## ##
## Systemd Version ## Systemd Version
## ##
# No watchfrr for systemd version %systemd_postun frr.service
#
# Stop all daemons other than zebra.
for daemon in %all_daemons ; do
eval restart=\$restart_${daemon}
[ "$restart" = yes ] && \
%systemd_postun ${daemon}.service
done
# Restart zebra.
[ "$running_zebra" = yes ] && \
%systemd_postun_with_restart $daemon.service
# Start all daemons other than zebra.
for daemon in %all_daemons ; do
eval restart=\$restart_${daemon}
[ "$restart" = yes ] && \
%systemd_post ${daemon}.service
done
%else %else
## ##
## init.d Version ## init.d Version
## ##
%if %{with_watchfrr} /etc/rc.d/init.d/frr restart >/dev/null 2>&1
# 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 watchfrr.
for daemon in %all_daemons ; do
eval restart=\$restart_${daemon}
[ "$restart" = yes ] && \
/etc/rc.d/init.d/${daemon} stop >/dev/null 2>&1
done
# Restart zebra.
[ "$running_zebra" = yes ] && \
/etc/rc.d/init.d/zebra restart >/dev/null 2>&1
# 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_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 %endif
fi fi
@ -476,7 +452,9 @@ fi
## ##
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
for daemon in %all_daemons ; do for daemon in %all_daemons ; do
%systemd_preun ${daemon}.service if [ x"${daemon}" != x"" ] ; then
%systemd_preun frr.service
fi
done done
fi fi
%else %else
@ -484,10 +462,8 @@ fi
## init.d Version ## init.d Version
## ##
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
for daemon in %all_daemons ; do /etc/rc.d/init.d/frr stop >/dev/null 2>&1
/etc/rc.d/init.d/${daemon} stop >/dev/null 2>&1 /sbin/chkconfig --del frr
/sbin/chkconfig --del ${daemon}
done
fi fi
%endif %endif
/sbin/install-info --delete %{_infodir}/frr.info.gz %{_infodir}/dir /sbin/install-info --delete %{_infodir}/frr.info.gz %{_infodir}/dir
@ -521,17 +497,15 @@ rm -rf %{buildroot}
%{_sbindir}/ospfd %{_sbindir}/ospfd
%{_sbindir}/ripd %{_sbindir}/ripd
%{_sbindir}/bgpd %{_sbindir}/bgpd
%{_sbindir}/ssd %exclude %{_sbindir}/ssd
%{_sbindir}/frr
%{_sbindir}/frr-reload.py
%{_sbindir}/frr-reload.pyc
%{_sbindir}/frr-reload.pyo
%if %{with_watchfrr} %if %{with_watchfrr}
%{_sbindir}/watchfrr %{_sbindir}/watchfrr
%endif %endif
%{_sbindir}/ripngd %{_sbindir}/ripngd
%{_sbindir}/ospf6d %{_sbindir}/ospf6d
%if %{with_pimd}
%{_sbindir}/pimd %{_sbindir}/pimd
%endif
%{_sbindir}/isisd %{_sbindir}/isisd
%if %{with_ldpd} %if %{with_ldpd}
%{_sbindir}/ldpd %{_sbindir}/ldpd
@ -540,33 +514,19 @@ rm -rf %{buildroot}
%{_sbindir}/nhrpd %{_sbindir}/nhrpd
%endif %endif
%if %{with_shared} %if %{with_shared}
%attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.so
%attr(755,root,root) %{_libdir}/lib*.so.* %{_libdir}/lib*.so.0
%attr(755,root,root) %{_libdir}/lib*.so.0.*
%endif %endif
%{_bindir}/* %{_bindir}/*
%config /etc/frr/[!v]* %config(noreplace) /etc/frr/[!v]*.conf*
%config(noreplace) %attr(750,%frr_user,%frr_user) /etc/frr/daemons
%if "%{initsystem}" == "systemd" %if "%{initsystem}" == "systemd"
%config %{_unitdir}/frr.service %config %{_unitdir}/frr.service
%{_sbindir}/frr
%else %else
%config /etc/rc.d/init.d/zebra %config /etc/rc.d/init.d/frr
%if %{with_watchfrr}
%config /etc/rc.d/init.d/watchfrr
%endif %endif
%config /etc/rc.d/init.d/ripd
%config /etc/rc.d/init.d/ospfd
%config /etc/rc.d/init.d/bgpd
%config /etc/rc.d/init.d/ripngd
%config /etc/rc.d/init.d/ospf6d
%config /etc/rc.d/init.d/isisd
%config /etc/rc.d/init.d/pimd
%if %{with_ldpd}
%config /etc/rc.d/init.d/ldpd
%endif
%if %{with_nhrpd}
%config /etc/rc.d/init.d/nhrpd
%endif
%endif
%config(noreplace) /etc/default/frr
%config(noreplace) /etc/pam.d/frr %config(noreplace) /etc/pam.d/frr
%config(noreplace) %attr(640,root,root) /etc/logrotate.d/* %config(noreplace) %attr(640,root,root) /etc/logrotate.d/*
@ -574,6 +534,12 @@ rm -rf %{buildroot}
%defattr(-,root,root) %defattr(-,root,root)
%doc tools %doc tools
%files pythontools
%defattr(-,root,root)
%{_sbindir}/frr-reload.py
%{_sbindir}/frr-reload.pyc
%{_sbindir}/frr-reload.pyo
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%if %{with_ospfclient} %if %{with_ospfclient}
@ -591,10 +557,17 @@ rm -rf %{buildroot}
%endif %endif
%changelog %changelog
* Tue Feb 14 2017 Timo Teräs <timo.teras@iki.fi> - %{version} * Mon Jun 5 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version}
- add nhrpd - added NHRP daemon
* Fri Jan 6 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version} * Thu Apr 17 2017 Martin Winter <mwinter@opensourcerouting.org>
- new subpackage frr-pythontools with python 2.7 restart script
- remove PIMd from CentOS/RedHat 6 RPM packages (won't work - too old)
- converted to single frr init script (not per daemon) based on debian init script
- created systemd service file for systemd based systems (which uses init script)
- Various other RPM package fixes for FRR 2.0
* Fri Jan 6 2017 Martin Winter <mwinter@opensourcerouting.org>
- Renamed to frr for FRRouting fork of Quagga - Renamed to frr for FRRouting fork of Quagga
* Thu Feb 11 2016 Paul Jakma <paul@jakma.org> * Thu Feb 11 2016 Paul Jakma <paul@jakma.org>

25
redhat/frr.sysconfig
View File

@ -1,25 +0,0 @@
#
# Default: Bind all daemon vtys to the loopback(s) only
#
BGPD_OPTS="-A 127.0.0.1"
ISISD_OPTS="-A ::1"
OSPF6D_OPTS="-A ::1"
OSPFD_OPTS="-A 127.0.0.1"
RIPD_OPTS="-A 127.0.0.1"
RIPNGD_OPTS="-A ::1"
ZEBRA_OPTS="-A 127.0.0.1"
PIMD_OPTS="-A 127.0.0.1"
LDPD_OPTS="-A 127.0.0.1"
# 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
# stopped; zebra will be started again; and then the previously running daemons
# will be started again.)
#
# Uncomment and edit this line to reflect the daemons you are actually using:
#WATCH_DAEMONS="zebra bgpd ospfd ospf6d ripd ripngd"
#
# Timer values can be adjusting by editing this line:
WATCH_OPTS="-Az -b_ -r/sbin/service_%s_restart -s/sbin/service_%s_start -k/sbin/service_%s_stop"

72
redhat/isisd.init
View File

@ -1,72 +0,0 @@
#!/bin/bash
# chkconfig: - 16 84
# config: /etc/frr/isisd.conf
### BEGIN INIT INFO
# Provides: isisd
# Short-Description: IS-IS routing engine
# Description: IS-IS routing engine for use with Zebra
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="isisd"
cmd=isisd
LOCK_FILE=/var/lock/subsys/isisd
CONF_FILE=/etc/frr/isisd.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 $ISISD_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

72
redhat/ldpd.init
View File

@ -1,72 +0,0 @@
#!/bin/bash
# chkconfig: - 16 84
# config: /etc/frr/ldpd.conf
### BEGIN INIT INFO
# Provides: ldpd
# Short-Description: LDP engine
# Description: LDP engine for use with Zebra
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="ldpd"
cmd=ldpd
LOCK_FILE=/var/lock/subsys/ldpd
CONF_FILE=/etc/frr/ldpd.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 $LDPD_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

72
redhat/ospf6d.init
View File

@ -1,72 +0,0 @@
#!/bin/bash
# chkconfig: - 16 84
# config: /etc/frr/ospf6d.conf
### BEGIN INIT INFO
# Provides: ospf6d
# Short-Description: OSPF routing engine for IPv6
# Description: OSPF routing engine for use with Zebra and IPv6
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="ospf6d"
cmd=ospf6d
LOCK_FILE=/var/lock/subsys/ospf6d
CONF_FILE=/etc/frr/ospf6d.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 $OSPF6D_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

72
redhat/ospfd.init
View File

@ -1,72 +0,0 @@
#!/bin/bash
# chkconfig: - 16 84
# config: /etc/frr/ospfd.conf
### BEGIN INIT INFO
# Provides: ospfd
# Short-Description: OSPF routing engine
# Description: OSPF routing engine for use with Zebra
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="ospfd"
cmd=ospfd
LOCK_FILE=/var/lock/subsys/ospfd
CONF_FILE=/etc/frr/ospfd.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 $OSPFD_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

72
redhat/pimd.init
View File

@ -1,72 +0,0 @@
#!/bin/bash
# chkconfig: - 16 84
# config: /etc/frr/pimd.conf
### BEGIN INIT INFO
# Provides: pimd
# Short-Description: PIM multicast routing engine
# Description: PIM routing engine for use with Zebra
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="pimd"
cmd=pimd
LOCK_FILE=/var/lock/subsys/pimd
CONF_FILE=/etc/frr/pimd.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 $PIMD_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

72
redhat/ripd.init
View File

@ -1,72 +0,0 @@
#!/bin/bash
# chkconfig: - 16 84
# config: /etc/frr/ripd.conf
### BEGIN INIT INFO
# Provides: ripd
# Short-Description: RIP routing engine
# Description: RIP routing engine for use with Zebra
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="ripd"
cmd=ripd
LOCK_FILE=/var/lock/subsys/ripd
CONF_FILE=/etc/frr/ripd.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 $RIPD_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

72
redhat/ripngd.init
View File

@ -1,72 +0,0 @@
#!/bin/bash
# chkconfig: - 16 84
# config: /etc/frr/ripngd.conf
### BEGIN INIT INFO
# Provides: ripngd
# Short-Description: RIP routing engine for IPv6
# Description: RIP routing engine for use with Zebra and IPv6
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="ripngd"
cmd=ripngd
LOCK_FILE=/var/lock/subsys/ripngd
CONF_FILE=/etc/frr/ripngd.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 $RIPNGD_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

66
redhat/watchfrr.init
View File

@ -1,66 +0,0 @@
#!/bin/bash
# chkconfig: 2345 17 83
### BEGIN INIT INFO
# Provides: watchfrr
# Short-Description: Frr watchdog
# Description: Frr watchdog for use with Zebra
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="watchfrr"
cmd=watchfrr
LOCK_FILE=/var/lock/subsys/watchfrr
case "$1" in
start)
# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 1
# Check that there are daemons to be monitored.
[ -z "$WATCH_DAEMONS" ] && exit 1
echo -n $"Starting $PROG: "
daemon $cmd -d $WATCH_OPTS $WATCH_DAEMONS
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

73
redhat/zebra.init
View File

@ -1,73 +0,0 @@
#!/bin/bash
# chkconfig: - 15 85
# config: /etc/frr/zebra.conf
### BEGIN INIT INFO
# Provides: zebra
# Short-Description: GNU Zebra routing manager
# Description: GNU Zebra routing manager
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
# Get network config
. /etc/sysconfig/network
# frr command line options
. /etc/sysconfig/frr
RETVAL=0
PROG="zebra"
cmd=zebra
LOCK_FILE=/var/lock/subsys/zebra
CONF_FILE=/etc/frr/zebra.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: "
/sbin/ip route flush proto zebra
daemon $cmd -d $ZEBRA_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

2
watchfrr/watchfrr.c
View File

@ -653,12 +653,10 @@ static void daemon_send_ready(void)
{ {
static int sent = 0; static int sent = 0;
if (!sent && gs.numdown == 0) { if (!sent && gs.numdown == 0) {
#if defined (HAVE_CUMULUS)
FILE *fp; FILE *fp;
fp = fopen(DAEMON_VTY_DIR "/watchfrr.started", "w"); fp = fopen(DAEMON_VTY_DIR "/watchfrr.started", "w");
fclose(fp); fclose(fp);
#endif
zlog_notice zlog_notice
("Watchfrr: Notifying Systemd we are up and running"); ("Watchfrr: Notifying Systemd we are up and running");
systemd_send_started(master, 0); systemd_send_started(master, 0);