diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-04-26 02:48:17 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-07-29 18:37:25 +0200 |
| commit | 7ac1de8ee01573ed97c890879adbe7cc1013718b (patch) | |
| tree | 5ab27ac55c25b88aed9a9a3f79a4823e3d6a4e72 /redhat | |
| parent | staticd: Start the addition of a staticd (diff) | |
| download | frr-7ac1de8ee01573ed97c890879adbe7cc1013718b.tar.xz frr-7ac1de8ee01573ed97c890879adbe7cc1013718b.zip | |
debianpkg, redhat, tools: Fixup startup/build for new daemon
Add code to allow FRR to properly build and handle the staticd
for some of the more common packaging.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/daemons | 2 | ||||
| -rwxr-xr-x | redhat/frr.init | 2 | ||||
| -rw-r--r-- | redhat/frr.spec.in | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/redhat/daemons b/redhat/daemons index b674d738b..f9dbffea4 100644 --- a/redhat/daemons +++ b/redhat/daemons @@ -51,6 +51,7 @@ eigrpd=no babeld=no sharpd=no pbrd=no +staticd=no # # Command line options for the daemons # @@ -68,6 +69,7 @@ eigrpd_options=("-A 127.0.0.1") babeld_options=("-A 127.0.0.1") sharpd_options=("-A 127.0.0.1") pbrd_options=("-A 127.0.0.1") +staticd_options=("-A 127.0.0.1") # # If the vtysh_enable is yes, then the unified config is read diff --git a/redhat/frr.init b/redhat/frr.init index 19b282fe1..740aa5b64 100755 --- a/redhat/frr.init +++ b/redhat/frr.init @@ -33,7 +33,7 @@ V_PATH=/var/run/frr # Local Daemon selection may be done by using /etc/frr/daemons. # See /usr/share/doc/frr/README.Debian.gz for further information. # Keep zebra first and do not list watchfrr! -DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd pimd pbrd ldpd nhrpd eigrpd babeld" +DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd pimd pbrd ldpd nhrpd eigrpd babeld staticd sharpd" MAX_INSTANCES=5 RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 85fb30904..f5b116978 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -85,7 +85,7 @@ %{!?frr_gid: %global frr_gid 92 } %{!?vty_gid: %global vty_gid 85 } -%define daemon_list zebra ripd ospfd bgpd isisd ripngd ospf6d pbrd +%define daemon_list zebra ripd ospfd bgpd isisd ripngd ospf6d pbrd staticd %if %{with_ldpd} %define daemon_ldpd ldpd @@ -416,6 +416,7 @@ zebra_spec_add_service () zebra_spec_add_service zebrasrv 2600/tcp "zebra service" zebra_spec_add_service zebra 2601/tcp "zebra vty" +zebra_spec_add_service staticd 2616/tcp "staticd vty" zebra_spec_add_service ripd 2602/tcp "RIPd vty" zebra_spec_add_service ripngd 2603/tcp "RIPngd vty" zebra_spec_add_service ospfd 2604/tcp "OSPFd vty" @@ -561,6 +562,7 @@ fi %{_infodir}/frr.info.gz %{_mandir}/man*/* %{_sbindir}/zebra +%{_sbindir}/staticd %{_sbindir}/ospfd %{_sbindir}/ripd %{_sbindir}/bgpd |