matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Rename: FreeRangeRouting FRRouting

Browse source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2017-03-30 14:22:35 -04:00
parent fdbfd655c1
commit 447a8fe92e
25 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,4 +1,4 @@
ChangeLog information for FreeRangeRouting is for now recorded in source-code ChangeLog information for FRRouting is for now recorded in source-code
management system. Please see: management system. Please see:
http://www.freerangerouting.org/ http://www.freerangerouting.org/

6
REPORTING-BUGS
View file

@ -1,5 +1,5 @@
This file describes the procedure for reporting FreeRangeRouting bugs. You are not This file describes the procedure for reporting FRRouting bugs. You are not
obliged to follow this format, but it would be great help for FreeRangeRouting developers obliged to follow this format, but it would be great help for FRRouting developers
if you report a bug as described below. if you report a bug as described below.
Bugs submitted with woefully incomplete information may be summarily Bugs submitted with woefully incomplete information may be summarily
@ -13,7 +13,7 @@ Report bugs on Github Issue Tracker at
https://github.com/freerangerouting/frr/issues https://github.com/freerangerouting/frr/issues
Please supply the following information: Please supply the following information:
1. Your FreeRangeRouting version or if it is from git then the commit reference. 1. Your FRRouting version or if it is from git then the commit reference.
Please try to report bugs against git master or the latest release. Please try to report bugs against git master or the latest release.
2. FRR daemons you run e.g. bgpd or ripd and full name of your OS. Any 2. FRR daemons you run e.g. bgpd or ripd and full name of your OS. Any
specific options you compiled Quagga with. specific options you compiled Quagga with.

6
configure.ac
View file

@ -1,5 +1,5 @@
## ##
## Configure template file for FreeRangeRouting. ## Configure template file for FRRouting.
## autoconf will generate configure script. ## autoconf will generate configure script.
## ##
## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org> ## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
@ -9,7 +9,7 @@ AC_PREREQ(2.60)
AC_INIT(frr, 2.0-rc2, [https://github.com/freerangerouting/frr/issues]) AC_INIT(frr, 2.0-rc2, [https://github.com/freerangerouting/frr/issues])
PACKAGE_URL="https://freerangerouting.org/" PACKAGE_URL="https://freerangerouting.org/"
PACKAGE_FULLNAME="FreeRangeRouting" PACKAGE_FULLNAME="FRRouting"
AC_SUBST(PACKAGE_FULLNAME) AC_SUBST(PACKAGE_FULLNAME)
CONFIG_ARGS="$ac_configure_args" CONFIG_ARGS="$ac_configure_args"
@ -1639,7 +1639,7 @@ AC_CONFIG_FILES([vtysh/extract.pl],[chmod +x vtysh/extract.pl])
AC_OUTPUT AC_OUTPUT
echo " echo "
FreeRangeRouting configuration FRRouting configuration
------------------------------ ------------------------------
FRR version : ${PACKAGE_VERSION} FRR version : ${PACKAGE_VERSION}
host operating system : ${host_os} host operating system : ${host_os}

2
defaults.h
View file

@ -2,7 +2,7 @@
* FRR switchable defaults. * FRR switchable defaults.
* Copyright (C) 2017 David Lamparter for NetDEF, Inc. * Copyright (C) 2017 David Lamparter for NetDEF, Inc.
* *
* This file is part of FreeRangeRouting (FRR). * This file is part of FRRouting (FRR).
* *
* FRR is free software; you can redistribute it and/or modify it under the * FRR is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software * terms of the GNU General Public License as published by the Free Software

2
doc/Building_FRR_on_CentOS6.md
View file

@ -69,7 +69,7 @@ any packages**
sudo groupadd -g 92 frr sudo groupadd -g 92 frr
sudo groupadd -r -g 85 frrvt sudo groupadd -r -g 85 frrvt
sudo useradd -u 92 -g 92 -M -r -G frrvt -s /sbin/nologin \ sudo useradd -u 92 -g 92 -M -r -G frrvt -s /sbin/nologin \
-c "FRR FreeRangeRouting suite" -d /var/run/frr frr -c "FRR FRRouting suite" -d /var/run/frr frr
### Download Source, configure and compile it ### Download Source, configure and compile it
(You may prefer different options on configure statement. These are just (You may prefer different options on configure statement. These are just

2
doc/Building_FRR_on_CentOS7.md
View file

@ -28,7 +28,7 @@ any packages**
sudo groupadd -g 92 frr sudo groupadd -g 92 frr
sudo groupadd -r -g 85 frrvt sudo groupadd -r -g 85 frrvt
sudo useradd -u 92 -g 92 -M -r -G frrvt -s /sbin/nologin \ sudo useradd -u 92 -g 92 -M -r -G frrvt -s /sbin/nologin \
-c "FRR FreeRangeRouting suite" -d /var/run/frr frr -c "FRR FRRouting suite" -d /var/run/frr frr
### Download Source, configure and compile it ### Download Source, configure and compile it
(You may prefer different options on configure statement. These are just (You may prefer different options on configure statement. These are just

2
doc/Building_FRR_on_Debian8.md
View file

@ -32,7 +32,7 @@ any packages**
sudo addgroup --system --gid 92 frr sudo addgroup --system --gid 92 frr
sudo addgroup --system --gid 85 frrvty sudo addgroup --system --gid 85 frrvty
sudo adduser --system --ingroup frr --groups frrvty --home /var/run/frr/ \ sudo adduser --system --ingroup frr --groups frrvty --home /var/run/frr/ \
--gecos "FRR FreeRangeRouting suite" --shell /bin/false frr --gecos "FRR FRRouting suite" --shell /bin/false frr
sudo usermode sudo usermode
### Download Source, configure and compile it ### Download Source, configure and compile it

2
doc/Building_FRR_on_Fedora24.md
View file

@ -21,7 +21,7 @@ using any packages**
sudo groupadd -g 92 frr sudo groupadd -g 92 frr
sudo groupadd -r -g 85 frrvt sudo groupadd -r -g 85 frrvt
sudo useradd -u 92 -g 92 -M -r -G frrvt -s /sbin/nologin \ sudo useradd -u 92 -g 92 -M -r -G frrvt -s /sbin/nologin \
-c "FRR FreeRangeRouting suite" -d /var/run/frr frr -c "FRR FRRouting suite" -d /var/run/frr frr
### Download Source, configure and compile it ### Download Source, configure and compile it
(You may prefer different options on configure statement. These are just (You may prefer different options on configure statement. These are just

2
lib/command.c
View file

@ -3087,7 +3087,7 @@ DEFUN (show_version,
DEFUN (frr_version_defaults, DEFUN (frr_version_defaults,
frr_version_defaults_cmd, frr_version_defaults_cmd,
"frr (version|defaults) .LINE", "frr (version|defaults) .LINE",
"FreeRangeRouting global parameters\n" "FRRouting global parameters\n"
"version configuration was written by\n" "version configuration was written by\n"
"set of configuration defaults used\n" "set of configuration defaults used\n"
"version string\n") "version string\n")

2
lib/version.h.in
View file

@ -39,7 +39,7 @@
#define FRR_SMUX_NAME "@PACKAGE_NAME@" #define FRR_SMUX_NAME "@PACKAGE_NAME@"
#define FRR_PTM_NAME "@PACKAGE_NAME@" #define FRR_PTM_NAME "@PACKAGE_NAME@"
#define FRR_FULL_NAME "FreeRangeRouting" #define FRR_FULL_NAME "FRRouting"
#define FRR_VERSION "@PACKAGE_VERSION@" GIT_SUFFIX #define FRR_VERSION "@PACKAGE_VERSION@" GIT_SUFFIX
#define FRR_VER_SHORT "@PACKAGE_VERSION@" #define FRR_VER_SHORT "@PACKAGE_VERSION@"
#define FRR_BUG_ADDRESS "@PACKAGE_BUGREPORT@" #define FRR_BUG_ADDRESS "@PACKAGE_BUGREPORT@"

2
ospfd/ospf_dump_api.c
View file

@ -2,7 +2,7 @@
* OSPFd dump routine (parts used by ospfclient). * OSPFd dump routine (parts used by ospfclient).
* Copyright (C) 1999, 2000 Toshiaki Takada * Copyright (C) 1999, 2000 Toshiaki Takada
* *
* This file is part of FreeRangeRouting (FRR). * This file is part of FRRouting (FRR).
* *
* FRR is free software; you can redistribute it and/or modify it under the * FRR is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software * terms of the GNU General Public License as published by the Free Software

2
ospfd/ospf_dump_api.h
View file

@ -2,7 +2,7 @@
* OSPFd dump routine (parts used by ospfclient). * OSPFd dump routine (parts used by ospfclient).
* Copyright (C) 1999 Toshiaki Takada * Copyright (C) 1999 Toshiaki Takada
* *
* This file is part of FreeRangeRouting (FRR). * This file is part of FRRouting (FRR).
* *
* FRR is free software; you can redistribute it and/or modify it under the * FRR is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software * terms of the GNU General Public License as published by the Free Software

2
redhat/README.rpm_build.md
View file

@ -1,4 +1,4 @@
Building your own FreeRangeRouting RPM Building your own FRRouting RPM
====================================== ======================================
(Tested on CentOS 6, CentOS 7 and Fedora 22.) (Tested on CentOS 6, CentOS 7 and Fedora 22.)

12
redhat/frr.spec.in
View file

@ -8,7 +8,7 @@
# rpms again and again on the same day, so the newer rpms can be installed. # rpms again and again on the same day, so the newer rpms can be installed.
# bumping the number each time. # bumping the number each time.
####################### FreeRangeRouting (FRR) configure options ######################### ####################### FRRouting (FRR) configure options #########################
# with-feature options # with-feature options
%{!?with_tcp_zebra: %global with_tcp_zebra 0 } %{!?with_tcp_zebra: %global with_tcp_zebra 0 }
%{!?with_pam: %global with_pam 0 } %{!?with_pam: %global with_pam 0 }
@ -128,14 +128,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
Obsoletes: bird gated mrt zebra frr-sysvinit Obsoletes: bird gated mrt zebra frr-sysvinit
%description %description
FreeRangeRouting is a free software that manages TCP/IP based routing FRRouting is a free software that manages TCP/IP based routing
protocol. It takes multi-server and multi-thread approach to resolve protocol. It takes multi-server and multi-thread approach to resolve
the current complexity of the Internet. the current complexity of the Internet.
FreeRangeRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM
and LDP and LDP
FreeRangeRouting is a fork of Quagga. FRRouting is a fork of Quagga.
%package contrib %package contrib
Summary: contrib tools for frr Summary: contrib tools for frr
@ -303,7 +303,7 @@ if getent group %frr_user >/dev/null; then : ; else \
fi fi
if getent passwd %frr_user >/dev/null ; then : ; else \ if getent passwd %frr_user >/dev/null ; then : ; else \
/usr/sbin/useradd -u %frr_uid -g %frr_gid \ /usr/sbin/useradd -u %frr_uid -g %frr_gid \
-M -r -s /sbin/nologin -c "FreeRangeRouting suite" \ -M -r -s /sbin/nologin -c "FRRouting suite" \
-d %_localstatedir %frr_user 2> /dev/null || : ; \ -d %_localstatedir %frr_user 2> /dev/null || : ; \
fi fi
%if 0%{?vty_group:1} %if 0%{?vty_group:1}
@ -571,7 +571,7 @@ rm -rf %{buildroot}
%changelog %changelog
* Fri Jan 6 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version} * Fri Jan 6 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version}
- Renamed to frr for FreeRangeRouting fork of Quagga - Renamed to frr for FRRouting fork of Quagga
* Thu Feb 11 2016 Paul Jakma <paul@jakma.org> * Thu Feb 11 2016 Paul Jakma <paul@jakma.org>
- remove with_ipv6 conditionals, always build v6 - remove with_ipv6 conditionals, always build v6

10
snapcraft/README.snap_build.md
View file

@ -1,4 +1,4 @@
Building your own FreeRangeRouting Snap Building your own FRRouting Snap
======================================== ========================================
(Tested on Ubuntu 16.04 with Snap Version 2, does not work on Ubuntu 15.x (Tested on Ubuntu 16.04 with Snap Version 2, does not work on Ubuntu 15.x
which uses earlier versions of snaps) which uses earlier versions of snaps)
@ -7,7 +7,7 @@ which uses earlier versions of snaps)
sudo apt-get install snapcraft sudo apt-get install snapcraft
2. Checkout FreeRangeRouting under a **unpriviledged** user account 2. Checkout FRRouting under a **unpriviledged** user account
git clone https://github.com/freerangerouting/frr.git git clone https://github.com/freerangerouting/frr.git
cd frr cd frr
@ -56,8 +56,8 @@ The Snap will be auto-started and running.
Operations Operations
========== ==========
### FreeRangeRouting Daemons ### FRRouting Daemons
At this time, all FreeRangeRouting daemons are auto-started. At this time, all FRRouting daemons are auto-started.
A daemon can be stopped/started with (ie ospf6d) A daemon can be stopped/started with (ie ospf6d)
@ -69,7 +69,7 @@ or disabled/enabled with
systemctl disable snap.frr.ospf6d.service systemctl disable snap.frr.ospf6d.service
systemctl enable snap.frr.ospf6d.service systemctl enable snap.frr.ospf6d.service
### FreeRangeRouting Commands ### FRRouting Commands
All the commands are prefixed with frr. All the commands are prefixed with frr.
frr.vtysh -> vtysh frr.vtysh -> vtysh

10
snapcraft/README.usage.md
View file

@ -1,14 +1,14 @@
Using the FreeRangeRouting Snap Using the FRRouting Snap
=============================== ===============================
After installing the Snap, the priviledged plug need to be connected: After installing the Snap, the priviledged plug need to be connected:
snap connect frr:network-control ubuntu-core:network-control snap connect frr:network-control ubuntu-core:network-control
Enabling/Disabling FreeRangeRouting Daemons Enabling/Disabling FRRouting Daemons
------------------------------------------- -------------------------------------------
By default (at this time), all FreeRangeRouting daemons will be enabled By default (at this time), all FRRouting daemons will be enabled
on installation. If you want to disable a specific daemon, then use on installation. If you want to disable a specific daemon, then use
the systemctl commands the systemctl commands
@ -24,7 +24,7 @@ Commands defined by this snap
----------------------------- -----------------------------
- `frr.vtysh`: - `frr.vtysh`:
FreeRangeRouting VTY Shell (configuration tool) FRRouting VTY Shell (configuration tool)
- `frr.version`: - `frr.version`:
Returns output of `zebra --version` to display version and configured Returns output of `zebra --version` to display version and configured
options options
@ -62,7 +62,7 @@ FAQ
Sourcecode available Sourcecode available
==================== ====================
The source for this SNAP is available as part of the FreeRangeRouting The source for this SNAP is available as part of the FRRouting
Source Code Distribution. Source Code Distribution.
https://github.com/freerangerouting/frr.git https://github.com/freerangerouting/frr.git

6
snapcraft/snapcraft.yaml.in
View file

@ -1,11 +1,11 @@
name: frr name: frr
version: @VERSION@ version: @VERSION@
summary: FreeRangeRouting BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP routing daemon summary: FRRouting BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP routing daemon
description: BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM routing daemon description: BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM routing daemon
FreeRangeRouting (FRR) is free software which manages TCP/IP based routing FRRouting (FRR) is free software which manages TCP/IP based routing
protocols. It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, protocols. It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2,
RIPng, PIM and LDP as well as the IPv6 versions of these. RIPng, PIM and LDP as well as the IPv6 versions of these.
FreeRangeRouting (frr) is a fork of Quagga. FRRouting (frr) is a fork of Quagga.
confinement: strict confinement: strict
grade: devel grade: devel

12
solaris/README.txt
View file

@ -15,13 +15,13 @@ Requirements:
i.manifest must be at least version 1.5. Place these scripts in i.manifest must be at least version 1.5. Place these scripts in
this directory if you are using Solaris 10 GA (which does not ship with this directory if you are using Solaris 10 GA (which does not ship with
these scripts), or in the solaris/ directory in the FreeRangeRouting source. these scripts), or in the solaris/ directory in the FRRouting source.
Package creation instructions: Package creation instructions:
------------------------------ ------------------------------
1. Configure and build FreeRangeRouting (frr) in the top level build directory as per normal, eg: 1. Configure and build FRRouting (frr) in the top level build directory as per normal, eg:
./configure --prefix=/usr/local/frr \ ./configure --prefix=/usr/local/frr \
--localstatedir=/var/run/frr \ --localstatedir=/var/run/frr \
@ -102,7 +102,7 @@ Install and post-install configuration notes:
# # svcs -l ripd # # svcs -l ripd
fmri svc:/network/routing/frr:ripd fmri svc:/network/routing/frr:ripd
name FreeRangeRouting: ripd, RIPv1/2 IPv4 routing protocol daemon. name FRRouting: ripd, RIPv1/2 IPv4 routing protocol daemon.
enabled true enabled true
state online state online
next_state none next_state none
@ -117,7 +117,7 @@ Install and post-install configuration notes:
- Configuration of startup options is by way of SMF properties in a - Configuration of startup options is by way of SMF properties in a
property group named 'frr'. The defaults should automatically be property group named 'frr'. The defaults should automatically be
inline with how you configured FreeRangeRouting in Step 1 above. inline with how you configured FRRouting in Step 1 above.
- By default the VTY interface is disabled. To change this, see below for - By default the VTY interface is disabled. To change this, see below for
how to set the 'frr/vty_port' property as appropriate for how to set the 'frr/vty_port' property as appropriate for
@ -176,11 +176,11 @@ Install and post-install configuration notes:
- As SMF is dependency aware, restarting network/zebra will restart all the - As SMF is dependency aware, restarting network/zebra will restart all the
other daemons. other daemons.
- To upgrade from one set of FreeRangeRouting packages to a newer release, - To upgrade from one set of FRRouting packages to a newer release,
one must first pkgrm the installed packages. When one pkgrm's FRRsmf all one must first pkgrm the installed packages. When one pkgrm's FRRsmf all
property configuration will be lost, and any customisations will have to property configuration will be lost, and any customisations will have to
redone after installing the updated FRRsmf package. redone after installing the updated FRRsmf package.
- These packages are not supported by Sun Microsystems, report bugs via the - These packages are not supported by Sun Microsystems, report bugs via the
usual FreeRangeRouting channels, ie Issue Tracker. Improvements/contributions of course would be greatly appreciated. usual FRRouting channels, ie Issue Tracker. Improvements/contributions of course would be greatly appreciated.

2
solaris/depend.daemons.in
View file

@ -1,4 +1,4 @@
P FRRlibs FreeRangeRouting common runtime libraries P FRRlibs FRRouting common runtime libraries
@PACKAGE_VERSION@,REV=@CONFDATE@ @PACKAGE_VERSION@,REV=@CONFDATE@
P SUNWcsu Core Solaris, (Usr) P SUNWcsu Core Solaris, (Usr)
P SUNWcsr Core Solaris Libraries (Root) P SUNWcsr Core Solaris Libraries (Root)

2
solaris/depend.dev.in
View file

@ -1,2 +1,2 @@
P FRRlibs FreeRangeRouting common runtime libraries P FRRlibs FRRouting common runtime libraries
@PACKAGE_VERSION@,REV=@CONFDATE@ @PACKAGE_VERSION@,REV=@CONFDATE@

2
solaris/depend.libs.in
View file

@ -1,5 +1,5 @@
P SUNWcslr Core Solaris Libraries (Root) P SUNWcslr Core Solaris Libraries (Root)
P SUNWcsl Core Solaris, (Shared Libs) P SUNWcsl Core Solaris, (Shared Libs)
P SUNWlibmsr Math & Microtasking Libraries (Root) P SUNWlibmsr Math & Microtasking Libraries (Root)
R FRRdaemons FreeRangeRouting daemons R FRRdaemons FRRouting daemons
R FRRdev R FRRdev

2
solaris/depend.smf.in
View file

@ -1,4 +1,4 @@
P FRRaemons FreeRangeRouting daemons P FRRaemons FRRouting daemons
@PACKAGE_VERSION@,REV=@CONFDATE@ @PACKAGE_VERSION@,REV=@CONFDATE@
P SUNWcsu Core Solaris, (Usr) P SUNWcsu Core Solaris, (Usr)
P SUNWcsr Core Solaris Libraries (Root) P SUNWcsr Core Solaris Libraries (Root)

12
solaris/frr.init.in
View file

@ -3,20 +3,20 @@
# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms. # Use is subject to license terms.
# #
# This file is part of FreeRangeRouting. # This file is part of FRRouting.
# #
# FreeRangeRouting is free software; you can redistribute it and/or modify # FRRouting is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by the # it under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2, or (at your option) any # Free Software Foundation; either version 2, or (at your option) any
# later version. # later version.
# #
# FreeRangeRouting is distributed in the hope that it will be useful, but # FRRouting is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with FreeRangeRouting; see the file COPYING. If not, write to # along with FRRouting; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# #
@ -74,7 +74,7 @@ handle_routeadm_upgrade () {
upgrade_config () { upgrade_config () {
DAEMON=$1 DAEMON=$1
# handle upgrade of SUNWzebra to FreeRangeRouting # handle upgrade of SUNWzebra to FRRouting
if [ -d "/etc/frr" -a ! -f "/etc/frr/${DAEMON}.conf" ] ; then if [ -d "/etc/frr" -a ! -f "/etc/frr/${DAEMON}.conf" ] ; then
if [ -f "/etc/sfw/zebra/${DAEMON}.conf" ] ; then if [ -f "/etc/sfw/zebra/${DAEMON}.conf" ] ; then
cp "/etc/sfw/zebra/${DAEMON}.conf" \ cp "/etc/sfw/zebra/${DAEMON}.conf" \
@ -216,7 +216,7 @@ case "${DAEMON}" in
;; ;;
esac esac
# Older FreeRangeRouting SMF packages pass daemon args on the commandline # Older FRRouting SMF packages pass daemon args on the commandline
# Newer SMF routeadm model uses properties for each argument # Newer SMF routeadm model uses properties for each argument
# so we must handle that. # so we must handle that.
if [ smf_present -a -f "$ROUTEADMINCLUDE" ]; then if [ smf_present -a -f "$ROUTEADMINCLUDE" ]; then

18
solaris/frr.xml.in
View file

@ -1,20 +1,20 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!-- <!--
This file is part of FreeRangeRouting (FRR) This file is part of FRRouting (FRR)
FreeRangeRouting is free software; you can redistribute it and/or FRRouting is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or published by the Free Software Foundation; either version 2, or
(at your option) anylater version. (at your option) anylater version.
FreeRangeRouting is distributed in the hope that it will be useful, FRRouting is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details. General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with FreeRangeRouting; see the file COPYING. If not, write to along with FRRouting; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330, the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
@ -107,9 +107,9 @@
<propval name='value_authorization' type='astring' <propval name='value_authorization' type='astring'
value='solaris.smf.value.routing' /> value='solaris.smf.value.routing' />
<!-- Options common to FreeRangeRouting daemons <!-- Options common to FRRouting daemons
Property names are equivalent to the long Property names are equivalent to the long
option name, consult FreeRangeRouting documentation --> option name, consult FRRouting documentation -->
<!-- The config file to use, if not the default --> <!-- The config file to use, if not the default -->
<propval name='config_file' type='astring' value=''/> <propval name='config_file' type='astring' value=''/>
<!-- The vty_port to listen on if not the default. <!-- The vty_port to listen on if not the default.
@ -142,7 +142,7 @@
<template> <template>
<common_name> <common_name>
<loctext xml:lang='C'> <loctext xml:lang='C'>
FreeRangeRouting: zebra, RIB, kernel intermediary and misc daemon FRRouting: zebra, RIB, kernel intermediary and misc daemon
</loctext> </loctext>
</common_name> </common_name>
<documentation> <documentation>
@ -240,7 +240,7 @@
<propval name='value_authorization' type='astring' <propval name='value_authorization' type='astring'
value='solaris.smf.value.routing' /> value='solaris.smf.value.routing' />
<!-- Options common to FreeRangeRouting daemons --> <!-- Options common to FRRouting daemons -->
<!-- The config file to use, if not the default --> <!-- The config file to use, if not the default -->
<propval name='config_file' type='astring' value=''/> <propval name='config_file' type='astring' value=''/>
<!-- The vty_port to listen on if not the default. <!-- The vty_port to listen on if not the default.
@ -273,7 +273,7 @@
<template> <template>
<common_name> <common_name>
<loctext xml:lang='C'> <loctext xml:lang='C'>
FreeRangeRouting: ripd, RIPv1/2 IPv4 routing protocol daemon. FRRouting: ripd, RIPv1/2 IPv4 routing protocol daemon.
</loctext> </loctext>
</common_name> </common_name>
<documentation> <documentation>

2
tests/helpers/python/frrtest.py
View file

@ -4,7 +4,7 @@
# Copyright (C) 2017 by David Lamparter & Christian Franke, # Copyright (C) 2017 by David Lamparter & Christian Franke,
# Open Source Routing / NetDEF Inc. # Open Source Routing / NetDEF Inc.
# #
# This file is part of FreeRangeRouting (FRR) # This file is part of FRRouting (FRR)
# #
# FRR is free software; you can redistribute it and/or modify it # FRR is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the # under the terms of the GNU General Public License as published by the