*: 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>

9 files changed, 8 insertions, 8 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 4cf35d7e32..1b04803366 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -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.
diff --git a/debian/README.Maintainer b/debian/README.Maintainer
index aa8ac0cf35..84b68e1949 100644
--- a/debian/README.Maintainer
+++ b/debian/README.Maintainer
@@ -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/
diff --git a/doc/Building_FRR_on_Ubuntu1204.md b/doc/Building_FRR_on_Ubuntu1204.md
index 521f0a0c2b..033e05bcdb 100644
--- a/doc/Building_FRR_on_Ubuntu1204.md
+++ b/doc/Building_FRR_on_Ubuntu1204.md
@@ -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 
diff --git a/doc/Building_FRR_on_Ubuntu1404.md b/doc/Building_FRR_on_Ubuntu1404.md
index 2c5f132ad7..11daecf195 100644
--- a/doc/Building_FRR_on_Ubuntu1404.md
+++ b/doc/Building_FRR_on_Ubuntu1404.md
@@ -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   
  
  
diff --git a/doc/Building_FRR_on_Ubuntu1604.md b/doc/Building_FRR_on_Ubuntu1604.md
index 327b7d68a0..8b8bbf4bb2 100644
--- a/doc/Building_FRR_on_Ubuntu1604.md
+++ b/doc/Building_FRR_on_Ubuntu1604.md
@@ -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   
 
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index efdf409959..aef7a7cd2a 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -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 \
diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
index 17dfc92ec4..cf58caeb4c 100644
--- a/tools/etc/frr/daemons
+++ b/tools/etc/frr/daemons
@@ -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
diff --git a/tools/etc/frr/debian.conf b/tools/etc/frr/daemons.conf
index eed8379e8c..eed8379e8c 100644
--- a/tools/etc/frr/debian.conf
+++ b/tools/etc/frr/daemons.conf
diff --git a/tools/frr b/tools/frr
index 1906b4ad15..40a44f4e63 100755
--- a/tools/frr
+++ b/tools/frr
@@ -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