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

diff --git a/debian/README.Debian b/debian/README.Debian
index 4cf35d7e325aefd91291159f4d8281fc4e9831fa..1b048033667d48a42884784873cfc5d995b6cf11 100644 (file)
--- 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 aa8ac0cf35504be4c3e3d7242394be9a6ac47c91..84b68e1949800654d53331e715197a80b91d9072 100644 (file)
--- 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 521f0a0c2bb8c5cf40b8e96a6d746acca5c8e868..033e05bcdb9764ebf8f292123e0823877ac80fd0 100644 (file)
--- 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 2c5f132ad7f62cbff9db9736a7433929cc1021f1..11daecf19504d2e0fadd039e4df1740b71a03b25 100644 (file)
--- 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 327b7d68a0701d5c26bd7959d537c8ac69578b76..8b8bbf4bb2e2bb860230eeb16e3e0aa5df2dc26b 100644 (file)
--- 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 efdf4099599ec2a05338eacac72d99d5b55769c5..aef7a7cd2a5cca067151445fd38e204968d62573 100644 (file)
--- 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 17dfc92ec4ac6f58cec607ef3a101c035e15e0dd..cf58caeb4c191f7357fcfc86320cbc16fd030c36 100644 (file)
--- 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/daemons.conf b/tools/etc/frr/daemons.conf
new file mode 100644 (file)
index 0000000..eed8379
--- /dev/null
+++ b/tools/etc/frr/daemons.conf
@@ -0,0 +1,20 @@
+#
+# If this option is set the /etc/init.d/frr script automatically loads
+# the config via "vtysh -b" when the servers are started.
+# Check /etc/pam.d/frr if you intend to use "vtysh"!
+#
+vtysh_enable=yes
+zebra_options="  -s 90000000 --daemon -A 127.0.0.1"
+bgpd_options="   --daemon -A 127.0.0.1"
+ospfd_options="  --daemon -A 127.0.0.1"
+ospf6d_options=" --daemon -A ::1"
+ripd_options="   --daemon -A 127.0.0.1"
+ripngd_options=" --daemon -A ::1"
+isisd_options="  --daemon -A 127.0.0.1"
+pimd_options="  --daemon -A 127.0.0.1"
+ldpd_options="  --daemon -A 127.0.0.1"
+nhrpd_options="  --daemon -A 127.0.0.1"
+
+# The list of daemons to watch is automatically generated by the init script.
+watchfrr_enable=yes
+watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30)

diff --git a/tools/etc/frr/debian.conf b/tools/etc/frr/debian.conf
deleted file mode 100644 (file)
index eed8379..0000000
--- a/tools/etc/frr/debian.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# If this option is set the /etc/init.d/frr script automatically loads
-# the config via "vtysh -b" when the servers are started.
-# Check /etc/pam.d/frr if you intend to use "vtysh"!
-#
-vtysh_enable=yes
-zebra_options="  -s 90000000 --daemon -A 127.0.0.1"
-bgpd_options="   --daemon -A 127.0.0.1"
-ospfd_options="  --daemon -A 127.0.0.1"
-ospf6d_options=" --daemon -A ::1"
-ripd_options="   --daemon -A 127.0.0.1"
-ripngd_options=" --daemon -A ::1"
-isisd_options="  --daemon -A 127.0.0.1"
-pimd_options="  --daemon -A 127.0.0.1"
-ldpd_options="  --daemon -A 127.0.0.1"
-nhrpd_options="  --daemon -A 127.0.0.1"
-
-# The list of daemons to watch is automatically generated by the init script.
-watchfrr_enable=yes
-watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30)

diff --git a/tools/frr b/tools/frr
index 1906b4ad1543b3b572df059c2882f92e33edc27b..40a44f4e639b5d40ea3937d05b41c0b312926688 100755 (executable)
--- 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