*: Rename debian.conf -> daemons.conf

The debian.conf file is to specific of a name towards
debian distributions.  Rename to be daemons.conf

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-04 12:45:01 -04:00
parent 0b4b83800c
commit 82e6e35843
9 changed files with 8 additions and 8 deletions

View File

@ -83,7 +83,7 @@ into the kernel.
=====================================================================
If this message occurs the receive buffer should be increased by adding the
following to /etc/sysctl.conf and "--nl-bufsize" to /etc/frr/debian.conf.
following to /etc/sysctl.conf and "--nl-bufsize" to /etc/frr/daemons.conf.
> net.core.rmem_default = 262144
> net.core.rmem_max = 262144
See message #4525 from 2005-05-09 in the quagga-users mailing list.

View File

@ -11,7 +11,7 @@ Files that keep their names
/usr/bin/vtysh
Files that got an -pj suffix
/etc/default/zebra -> /etc/frr/debian.conf
/etc/default/zebra -> /etc/frr/daemons.conf
/etc/init.d/zebra -> /etc/init.d/frr
/etc/zebra/ -> /etc/frr/
/usr/share/doc/zebra/ -> /usr/share/doc/frr/

View File

@ -136,7 +136,7 @@ other settings)
sudo install -m 755 tools/frr /etc/init.d/frr
sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons
sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf
sudo install -m 644 cumulus/etc/frr/daemons.conf /etc/frr/daemons.conf
sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf
### Enable daemons

View File

@ -96,7 +96,7 @@ other settings)
sudo install -m 755 tools/frr /etc/init.d/frr
sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons
sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf
sudo install -m 644 cumulus/etc/frr/daemons.conf /etc/frr/daemons.conf
sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf

View File

@ -118,7 +118,7 @@ Add the following lines to `/etc/modules-load.d/modules.conf`:
sudo install -m 644 tools/frr.service /etc/systemd/system/frr.service
sudo install -m 644 cumulus/etc/default/frr /etc/default/frr
sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons
sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf
sudo install -m 644 cumulus/etc/frr/daemons.conf /etc/frr/daemons.conf
sudo install -m 644 cumulus/etc/frr/Frr.conf /etc/frr/Frr.conf
sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf

View File

@ -291,7 +291,7 @@ for daemon in %{all_daemons} ; do
done
%endif
install %{frr_tools_dir}/frr/debian.conf %{buildroot}/etc/frr
install %{frr_tools_dir}/frr/daemons.conf %{buildroot}/etc/frr
install %{frr_tools_dir}/frr/daemons %{buildroot}/etc/frr
install -m644 %{frr_tools_dir}/default/frr %{buildroot}/etc/default
install -m644 %{zeb_rh_src}/frr.pam \

View File

@ -19,7 +19,7 @@
# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
#
# The watchfrr daemon is always started. Per default in monitoring-only but
# that can be changed via /etc/frr/debian.conf.
# that can be changed via /etc/frr/daemons.conf.
#
zebra=no
bgpd=no

View File

@ -476,7 +476,7 @@ check_status()
# Load configuration
. "$C_PATH/daemons"
. "$C_PATH/debian.conf"
. "$C_PATH/daemons.conf"
# Read configuration variable file if it is present
[ -r /etc/default/frr ] && . /etc/default/frr