diff --git a/Makefile.am b/Makefile.am index c0efa1925a..d87b5943d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,12 +4,11 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \ @ISISD@ @PIMD@ @NHRPD@ @EIGRPD@ \ @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \ - redhat @SOLARIS@ tests tools cumulus snapcraft + redhat @SOLARIS@ tests tools snapcraft DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \ isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \ - solaris pimd nhrpd eigrpd @LIBRFP@ @RFPTEST@ tools cumulus \ - snapcraft + solaris pimd nhrpd eigrpd @LIBRFP@ @RFPTEST@ tools snapcraft EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \ update-autotools \ diff --git a/configure.ac b/configure.ac index d53f1f5b9b..9bdcfd1e65 100755 --- a/configure.ac +++ b/configure.ac @@ -315,6 +315,8 @@ AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)])) AC_ARG_ENABLE(cumulus, AS_HELP_STRING([--enable-cumulus], [enable Cumulus Switch Special Extensions])) +AC_ARG_ENABLE(datacenter, + AS_HELP_STRING([--enable-datacenter], [enable Compilation for Data Center Extensions])) AC_ARG_ENABLE(rr-semantics, AS_HELP_STRING([--disable-rr-semantics], [disable the v6 Route Replace semantics])) AC_ARG_ENABLE([protobuf], @@ -383,12 +385,17 @@ case "$host" in esac AC_SUBST(MPLS_METHOD) -if test "${enable_cumulus}" = "yes" ; then - AC_DEFINE(HAVE_CUMULUS,,Compile Special Cumulus Code in) +if test "${enable_datacenter}" = "yes" ; then + AC_DEFINE(HAVE_DATACENTER,,Compile extensions for a DataCenter) DFLT_NAME="datacenter" else DFLT_NAME="traditional" fi + +if test "${enable_cumulus}" = "yes" ; then + AC_DEFINE(HAVE_CUMULUS,,Compile Special Cumulus Code in) +fi + AC_SUBST(DFLT_NAME) AC_DEFINE_UNQUOTED(DFLT_NAME,["$DFLT_NAME"], Name of the configuration default set) @@ -1841,7 +1848,6 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile nhrpd/Makefile redhat/Makefile tools/Makefile - cumulus/Makefile pkgsrc/Makefile fpm/Makefile redhat/frr.spec diff --git a/cumulus/.gitignore b/cumulus/.gitignore deleted file mode 100644 index 2a198f5d45..0000000000 --- a/cumulus/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.o -ssd diff --git a/cumulus/Makefile.am b/cumulus/Makefile.am deleted file mode 100644 index 027862314c..0000000000 --- a/cumulus/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -sbin_PROGRAMS = ssd -EXTRA_DIST = etc/frr/debian.conf etc/frr/daemons etc/default/frr - -ssd_SOURCES = start-stop-daemon.c 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/debian/frr.install b/debian/frr.install index e81ebbc5be..49aeb395bb 100644 --- a/debian/frr.install +++ b/debian/frr.install @@ -17,7 +17,6 @@ usr/share/man/man8/zebra.8 usr/share/man/man8/isisd.8 usr/share/man/man8/watchfrr.8 usr/share/snmp/mibs/ -cumulus/etc/* etc/ tools/etc/* etc/ tools/*.service lib/systemd/system debian/frr.conf usr/lib/tmpfiles.d diff --git a/defaults.h b/defaults.h index 57e35f3ce6..4a5cc8252a 100644 --- a/defaults.h +++ b/defaults.h @@ -23,7 +23,7 @@ #include "config.h" -#ifdef HAVE_CUMULUS +#ifdef HAVE_DATACENTER #define DFLT_BGP_IMPORT_CHECK 1 #define DFLT_BGP_TIMERS_CONNECT 10 @@ -36,7 +36,7 @@ #define DFLT_OSPF_LOG_ADJACENCY_CHANGES 1 #define DFLT_OSPF6_LOG_ADJACENCY_CHANGES 1 -#else /* !HAVE_CUMULUS */ +#else /* !HAVE_DATACENTER */ #define DFLT_BGP_IMPORT_CHECK 0 #define DFLT_BGP_TIMERS_CONNECT 120 @@ -49,6 +49,6 @@ #define DFLT_OSPF_LOG_ADJACENCY_CHANGES 0 #define DFLT_OSPF6_LOG_ADJACENCY_CHANGES 0 -#endif /* !HAVE_CUMULUS */ +#endif /* !HAVE_DATACENTER */ #endif /* _FRR_DEFAULTS_H */ 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/doc/install.texi b/doc/install.texi index d989928b8f..9a98f46733 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -63,6 +63,9 @@ Do not build bgpd. @item --disable-bgp-announce Make @command{bgpd} which does not make bgp announcements at all. This feature is good for using @command{bgpd} as a BGP announcement listener. +@item --enable-datacenter +Enable system defaults to work as if in a Data Center. See defaults.h +for what is changed by this configure option. @item --enable-snmp Enable SNMP support. By default, SNMP support is disabled. @item --disable-ospfapi diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index c32e3e3af8..aef7a7cd2a 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -34,7 +34,7 @@ %define zeb_rh_src %{zeb_src}/redhat %define zeb_docs %{zeb_src}/doc %define frr_tools %{zeb_src}/tools -%define cumulus_dir %{zeb_src}/cumulus/etc +%define frr_tools_etc %{frr_tools}/etc # defines for configure %define _localstatedir /var/run/frr @@ -291,9 +291,9 @@ for daemon in %{all_daemons} ; do done %endif -install %{cumulus_dir}/frr/debian.conf %{buildroot}/etc/frr -install %{cumulus_dir}/frr/daemons %{buildroot}/etc/frr -install -m644 %{cumulus_dir}/default/frr %{buildroot}/etc/default +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 \ %{buildroot}/etc/pam.d/frr install -m644 %{zeb_rh_src}/frr.logrotate \ diff --git a/tools/Makefile.am b/tools/Makefile.am index b2d56170c1..de81919cdd 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,6 +4,8 @@ AM_CFLAGS = $(WERROR) EXTRA_DIST = bin_PROGRAMS = permutations +sbin_PROGRAMS = ssd + permutations_SOURCES = permutations.c permutations_LDADD = ../lib/libfrr.la @@ -12,3 +14,5 @@ sbin_SCRIPTS = frr-reload.py frr EXTRA_DIST += frr.service frr-reload.py frr EXTRA_DIST += xml2cli.pl + +ssd_SOURCES = start-stop-daemon.c diff --git a/cumulus/etc/default/frr b/tools/etc/default/frr similarity index 100% rename from cumulus/etc/default/frr rename to tools/etc/default/frr diff --git a/cumulus/etc/frr/daemons b/tools/etc/frr/daemons similarity index 95% rename from cumulus/etc/frr/daemons rename to tools/etc/frr/daemons index ccc4b2a09e..eb7a5c9a96 100644 --- a/cumulus/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/cumulus/etc/frr/debian.conf b/tools/etc/frr/daemons.conf similarity index 100% rename from cumulus/etc/frr/debian.conf rename to tools/etc/frr/daemons.conf diff --git a/cumulus/etc/frr/Frr.conf b/tools/etc/frr/frr.conf similarity index 100% rename from cumulus/etc/frr/Frr.conf rename to tools/etc/frr/frr.conf diff --git a/cumulus/etc/frr/vtysh.conf b/tools/etc/frr/vtysh.conf similarity index 100% rename from cumulus/etc/frr/vtysh.conf rename to tools/etc/frr/vtysh.conf diff --git a/cumulus/etc/sudoers.d/frr_sudoers b/tools/etc/sudoers.d/frr_sudoers similarity index 100% rename from cumulus/etc/sudoers.d/frr_sudoers rename to tools/etc/sudoers.d/frr_sudoers diff --git a/tools/frr b/tools/frr index 77b5bcf79f..6f00700e40 100755 --- a/tools/frr +++ b/tools/frr @@ -485,7 +485,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 diff --git a/cumulus/start-stop-daemon.c b/tools/start-stop-daemon.c similarity index 100% rename from cumulus/start-stop-daemon.c rename to tools/start-stop-daemon.c