Commit Graph

5236 Commits

Author SHA1 Message Date
smccroskey
20701ca33a redhat: use %initsystem check that works when chrooted
`systemctl' returns different, non-useful output while in a chroot.
Switch to checking if /sbin/init is a symlink to the systemd binary.
With this change the build works in a mock chroot.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-04-28 03:04:50 -07:00
Martin Winter
f9e0332e10 redhat: fix README for rpm package build
- correct requirements
- add comment on bison 2.7 installation on CentOS 6

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-19 18:45:03 -07:00
Martin Winter
6dc47763f4 redhat: redirect reload function in frr init script to restart if reload script is not installed (fixes systemctl restart)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-19 18:41:45 -07:00
Martin Winter
362bca980c redhat: fix duplicate Requires: line in spec file
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-19 18:39:49 -07:00
Martin Winter
b387c334d4 redhat: Fix BuildRequires for FRR/2.0 and duplicate /etc/frr/daemons
- add make & gcc
- remove autoconf and automake (not needed to build from src.rpm)
- fix texi2html version detection for case when no texi2html is installed (broke yum-builddep)
- fix duplicate listing of /etc/frr/daemons

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-19 18:12:10 -07:00
Martin Winter
3630ef2d24 redhat: Update documentation for RPM build and usage
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-17 18:45:50 -07:00
Martin Winter
19ced9a4b8 redhat: fix upgrade script (%postun), remove invalid mpls package selection (it's always built and auto detected), add ldpd
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-17 18:34:32 -07:00
Martin Winter
2cdd3d94fc redhat: Add frr.service file for redhat based systemd systems (using init script)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-17 18:17:16 -07:00
Martin Winter
178b92ceb1 redhat: /etc/frr/daemons needs to be marked as no replace config to be save from overwriting
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-15 03:29:34 -07:00
Martin Winter
c2953ac5d6 redhat: Add (combined) init.d script for FRR with daemon selection based on /etc/frr/daemons
- Provide new frr init script
- Remove separate per-deamon init.d scripts

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-15 03:13:07 -07:00
Martin Winter
36d85ca8e3 watchfrr: Remove the HAVE_CUMULUS around the watchfrr.started file. It's always useful
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-15 02:00:15 -07:00
Martin Winter
4d3bac5b14 redhat: Add python2 build requirement to pythontools sub package
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-14 02:21:44 -07:00
Martin Winter
df1a7ae4ce redhat: Fix previously added centos6/redhat6 check
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-14 02:20:31 -07:00
Martin Winter
33fdbd5efb redhat: Fix install (daemon selection) and make postun scripts compatible with fedora
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-14 01:28:13 -07:00
Martin Winter
41b86ba421 redhat: Always disable PIMd on CentOS 6 and RedHat 6 systems as they are too old to correctly support the protocol
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-13 18:54:58 -07:00
Martin Winter
386fcd12a4 redhat: Move frr-reload python script to it's own sub package to avoid the python2 requirement for main frr package
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-13 17:34:26 -07:00
Martin Winter
a88f3f42f9 redhat: Don't set file attributes for symlinks
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-13 17:33:24 -07:00
Martin Winter
1b2b123042 redhat: Fix ospf6d typo in frr.spec.in
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-13 15:00:16 -07:00
Martin Winter
58f20b90ee redhat: Fix dependencies for rpm package
- Add bison, flex & autoconf
- Remove systemd for systems without it (i.e. CentOS 6)
- Update doc to reflect dependencies

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-12 20:23:18 -07:00
Martin Winter
9a581ae412 redhat: Remove tab's with spaces in frr.spec.in to make it better readable
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-12 19:10:35 -07:00
Martin Winter
94c0033565 redhat: Replace tab's with spaces in README
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-12 18:54:40 -07:00
Donald Sharp
81a37d8911 Merge pull request #365 from opensourcerouting/snap-doc-fixes
snapcraft: Improve README.usage.md based on feedback received
2017-04-12 21:12:26 -04:00
Martin Winter
2a3a819a9c snapcraft: Improve README.usage.md based on feedback received
- Fix snap connect (it's now called core, not ubuntu-core)
- Add section on MPLS configuration
- Add FAQ topic on ospfd/ospf6d crashing before privs are assigned to snap
- Add pointer to official webpage

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-12 16:00:43 -07:00
Donald Sharp
902726b81f doc: Cleanup 'Build the Software'
The frrouting.org web page:
https://frrouting.org/manual/Build-the-Software.html#Build-the-Software
is built from doc/install.texi.  The output on this page is a bit
missleading, let's clean it up some.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-04-07 17:20:32 -04:00
Martin Winter
3e71b5d907 Release: FRR-2.0
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-04-01 22:22:47 -07:00
Mike Tancsa
7e5b539722 lib: fix usage of getgrouplist() in *BSD
On BSD systems, the getgrouplist() function returns 0 if successful and
-1 on error.

Linux in the other hand returns *ngroups (the number of groups of which
user is a member) on success and -1 on error.

Given this difference, the most portable way to use getgrouplist()
is use its return value only for checking if it succeeded or not.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2017-04-01 00:50:40 -04:00
Donald Sharp
98b506c210 Merge pull request #307 from LabNConsulting/working/2.0/patch/rename2
Rename: FreeRangeRouting --> FRRouting
2017-03-30 14:23:55 -05:00
Lou Berger
d6180888fc Rename: freerangerouting --> frrouting
Signed-off-by: Lou Berger <lberger@labn.net>
2017-03-30 14:24:05 -04:00
Lou Berger
447a8fe92e Rename: FreeRangeRouting FRRouting
Signed-off-by: Lou Berger <lberger@labn.net>
2017-03-30 14:22:35 -04:00
Donald Sharp
fdbfd655c1 Merge pull request #299 from opensourcerouting/test-ref-out
tests: format TestRefMismatch more readable
2017-03-30 06:14:21 -05:00
Donald Sharp
aba41ec40c Merge pull request #298 from opensourcerouting/defaults
track version & "defaults" in configs
2017-03-30 06:13:19 -05:00
David Lamparter
8efe88eacf *: track version & "defaults" in configs
[CF]: Move default name to autoconf and update tests

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
2017-03-28 19:18:42 +02:00
Christian Franke
1ea8289e2a tests: format TestRefMismatch more readable
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
2017-03-28 18:56:38 +02:00
Donald Sharp
59ad9d4f30 Merge pull request #295 from opensourcerouting/community_md_edits
COMMUNITY.md: update CodingStyle & branching
2017-03-25 07:36:53 -04:00
David Lamparter
02fe6f865e COMMUNITY.md: update CodingStyle & branching
Also add a note that this is documentation, not law.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-25 10:37:57 +01:00
Renato Westphal
c1ec5aaf7c Merge pull request #277 from donaldsharp/proto-dev-build
Proto dev build
2017-03-21 12:31:41 -03:00
Donald Sharp
6405e44fe5 Merge pull request #281 from opensourcerouting/snapcraft-fixes
Snapcraft fixes
2017-03-21 11:11:16 -04:00
Martin Winter
567dd75c07 snapcraft: Change setup/ to snap/ directory based on new snap format
DEPRECATED: Assets in 'setup/gui' should now be placed in 'snap/gui'.
See http://snapcraft.io/docs/deprecation-notices/dn3 for more information.

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-03-17 20:54:34 -07:00
Martin Winter
d1c2443dc7 snapcraft: Add missing snapcraft files from dist (make dist) archive
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-03-17 20:54:28 -07:00
Donald Sharp
358336ef36 zebra: zebra_fpm_dt.c does not always need protobuf
When compiling zebra_fpm_dt.c only pull in
protobuf headers if we've turned it on.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-15 09:48:12 -04:00
Donald Sharp
9cbae545f0 zebra: Fix protobuf build on stable/2.0
When compiling w/ --enable-protobuf on stable/2.0
we were attempting to dereference the zvrf->vrf_id
which got moved to zvrf->vrf->vrf_id.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-15 09:25:43 -04:00
Donald Sharp
81180ab813 Merge pull request #272 from opensourcerouting/snapcraft-logo-update
snapcraft: Replace temporary logo with official FRR logo
2017-03-11 06:58:24 -05:00
Martin Winter
5b848048d7 snapcraft: Replace temporary logo with official FRR logo
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-03-11 12:48:55 +07:00
David Lamparter
e2675fbd56 Merge pull request #266 from donaldsharp/nht
bug fixes
2017-03-10 14:10:10 +01:00
Donald Sharp
feb554e508 zebra: Fix specific prefix handling
Suppose we are handling the process_workq and either a new static
route is installed or a Routing Protocol installs a new route.
We will call evaluate_rnh with a specific prefix.  We might
have a situation where we clear the NHC flag prematurely.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-09 19:37:23 -05:00
Donald Sharp
a40ccc86af Merge pull request #267 from opensourcerouting/vty-completion-again
vty completion memory counting redux
2017-03-09 15:34:57 -05:00
Lou Berger
6253a46a75 lib: handle case specifc types, protect against double free (issue #144)
Signed-off-by: Lou Berger <lberger@labn.net>
[DL: dropped changes except the two NULL assignments]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-09 19:24:49 +01:00
David Lamparter
4dcee34bd6 Revert "lib: Fix tab completions memleak, memory stats corruption"
This reverts commit 039dc61292.

The patch actually made the situation worse since the return value from
cmd_complete_command_real() was now inconsistently allocated from
different memory stat pools.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-03-09 19:23:00 +01:00
Martín Beauchamp
685e701ef3 Lowercase frr.conf 2017-03-09 09:45:00 -05:00
Donald Sharp
8ce5e6a33c zebra: Notify all nexthops that we've changed
Zebra when it was scanning the tree would unset NEXTHOPS_CHANGED
after the first notification.  If the route we are notifying because
of covers multiple interesting nexthops then we would be unable
to know that we need to notify for that one as well because of
the flag removal.

Ticket: CM-15157
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-03-09 09:38:41 -05:00