proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-14 01:52:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #229 from ChairmanTubeAmp/martinb-lower-frr.conf

Browse Source 
Lowercase frr.conf
This commit is contained in:
Donald Sharp 2017-02-27 15:49:15 -05:00 committed by GitHub
commit 3f26b48e86
12 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/README.Debian vendored
View File

@ -93,5 +93,5 @@ See message #4525 from 2005-05-09 in the quagga-users mailing list.
=========================== ===========================
Check /etc/pam.d/frr, it probably denies access to your user. The passwords Check /etc/pam.d/frr, it probably denies access to your user. The passwords
configured in /etc/frr/Frr.conf are only for telnet access. configured in /etc/frr/frr.conf are only for telnet access.

2
debian/frr.preinst vendored
View File

@ -66,7 +66,7 @@ if [ "$1" = "install" ]; then
fi fi
# Exceptions for vtysh. # Exceptions for vtysh.
f=$d/Frr.conf f=$d/frr.conf
if [ -f $d/Zebra.conf ]; then if [ -f $d/Zebra.conf ]; then
mv $d/Zebra.conf $f mv $d/Zebra.conf $f
fi fi

2
doc/vtysh.1.in
View File

@ -73,7 +73,7 @@ The default location of the
.B vtysh .B vtysh
config file. config file.
.TP .TP
.BI @CFG_SYSCONF@/Frr.conf .BI @CFG_SYSCONF@/frr.conf
The default location of the integrated @PACKAGE_FULLNAME@ routing engine config file The default location of the integrated @PACKAGE_FULLNAME@ routing engine config file
if integrated config file is in use (not default). if integrated config file is in use (not default).
.TP .TP

24
doc/vtysh.texi
View File

@ -61,13 +61,13 @@ at all.
@section Integrated configuration mode @section Integrated configuration mode
Integrated configuration mode uses a single configuration file, Integrated configuration mode uses a single configuration file,
@file{Frr.conf}, for all daemons. This replaces the individual files like @file{frr.conf}, for all daemons. This replaces the individual files like
@file{zebra.conf} or @file{bgpd.conf}. @file{zebra.conf} or @file{bgpd.conf}.
@file{Frr.conf} is located in @file{@value{INSTALL_PREFIX_ETC}}. All @file{frr.conf} is located in @file{@value{INSTALL_PREFIX_ETC}}. All
daemons check for the existence of this file at startup, and if it exists daemons check for the existence of this file at startup, and if it exists
will not load their individual configuration files. Instead, will not load their individual configuration files. Instead,
@command{vtysh -b} must be invoked to process @file{Frr.conf} and apply @command{vtysh -b} must be invoked to process @file{frr.conf} and apply
its settings to the individual daemons. its settings to the individual daemons.
@quotation Warning @quotation Warning
@ -76,7 +76,7 @@ its settings to the individual daemons.
@subsection Configuration saving, file ownership and permissions @subsection Configuration saving, file ownership and permissions
The @file{Frr.conf} file is not written by any of the daemons; instead The @file{frr.conf} file is not written by any of the daemons; instead
@command{vtysh} contains the neccessary logic to collect configuration from @command{vtysh} contains the neccessary logic to collect configuration from
all of the daemons, combine it and write it out. all of the daemons, combine it and write it out.
@ -90,7 +90,7 @@ Since the @command{vtysh} command may be running as ordinary user on the
system, configuration writes will be tried through @command{watchfrr}, system, configuration writes will be tried through @command{watchfrr},
using the @command{write integrated} command internally. Since using the @command{write integrated} command internally. Since
@command{watchfrr} is running as superuser, @command{vtysh} is able to @command{watchfrr} is running as superuser, @command{vtysh} is able to
ensure correct ownership and permissions on @file{Frr.conf}. ensure correct ownership and permissions on @file{frr.conf}.
If @command{watchfrr} is not running or the configuration write fails, If @command{watchfrr} is not running or the configuration write fails,
@command{vtysh} will attempt to directly write to the file. This is likely @command{vtysh} will attempt to directly write to the file. This is likely
@ -102,7 +102,7 @@ Writing the configuration can be triggered directly by invoking
should be run as either the superuser or the Frr user. should be run as either the superuser or the Frr user.
We recommend you do not mix the use of the two types of files. Further, it We recommend you do not mix the use of the two types of files. Further, it
is better not to use the integrated Frr.conf file, as any syntax error in is better not to use the integrated frr.conf file, as any syntax error in
it can lead to /all/ of your daemons being unable to start up. Per daemon it can lead to /all/ of your daemons being unable to start up. Per daemon
files are more robust as impact of errors in configuration are limited to files are more robust as impact of errors in configuration are limited to
the daemon in whose file the error is made. the daemon in whose file the error is made.
@ -110,7 +110,7 @@ the daemon in whose file the error is made.
@deffn {Command} {service integrated-vtysh-config} {} @deffn {Command} {service integrated-vtysh-config} {}
@deffnx {Command} {no service integrated-vtysh-config} {} @deffnx {Command} {no service integrated-vtysh-config} {}
Control whether integrated @file{Frr.conf} file is written when Control whether integrated @file{frr.conf} file is written when
'write file' is issued. 'write file' is issued.
These commands need to be placed in @file{vtysh.conf} to have any effect. These commands need to be placed in @file{vtysh.conf} to have any effect.
@ -122,18 +122,18 @@ This command has 3 states:
@item @item
@command{service integrated-vtysh-config} @command{service integrated-vtysh-config}
@command{vtysh} will always write @file{Frr.conf}. @command{vtysh} will always write @file{frr.conf}.
@item @item
@command{no service integrated-vtysh-config} @command{no service integrated-vtysh-config}
@command{vtysh} will never write @file{Frr.conf}; instead it will ask @command{vtysh} will never write @file{frr.conf}; instead it will ask
daemons to write their individual configuration files. daemons to write their individual configuration files.
@item @item
Neither option present (default) Neither option present (default)
@command{vtysh} will check whether @file{Frr.conf} exists. If it does, @command{vtysh} will check whether @file{frr.conf} exists. If it does,
configuration writes will update that file. Otherwise, writes are performed configuration writes will update that file. Otherwise, writes are performed
through the individual daemons. through the individual daemons.
@end itemize @end itemize
@ -146,7 +146,7 @@ installations.
@deffn {Command} {write integrated} {} @deffn {Command} {write integrated} {}
Unconditionally (regardless of @command{service integrated-vtysh-config} Unconditionally (regardless of @command{service integrated-vtysh-config}
setting) write out integrated @file{Frr.conf} file through setting) write out integrated @file{frr.conf} file through
@command{watchfrr}. If @command{watchfrr} is not running, this command @command{watchfrr}. If @command{watchfrr} is not running, this command
is unavailable. is unavailable.
@ -156,6 +156,6 @@ is unavailable.
Configuration changes made while some daemon is not running will be invisible Configuration changes made while some daemon is not running will be invisible
to that daemon. The daemon will start up with its saved configuration to that daemon. The daemon will start up with its saved configuration
(either in its individual configuration file, or in @file{Frr.conf}). (either in its individual configuration file, or in @file{frr.conf}).
This is particularly troublesome for route-maps and prefix lists, which would This is particularly troublesome for route-maps and prefix lists, which would
otherwise be synchronized between daemons. otherwise be synchronized between daemons.

2
lib/vty.h
View File

@ -177,7 +177,7 @@ struct vty_arg
}; };
/* Integrated configuration file. */ /* Integrated configuration file. */
#define INTEGRATE_DEFAULT_CONFIG "Frr.conf" #define INTEGRATE_DEFAULT_CONFIG "frr.conf"
/* Small macro to determine newline is newline only or linefeed needed. */ /* Small macro to determine newline is newline only or linefeed needed. */
#define VTY_NEWLINE ((vty->type == VTY_TERM) ? "\r\n" : "\n") #define VTY_NEWLINE ((vty->type == VTY_TERM) ? "\r\n" : "\n")

10
tools/frr
View File

@ -61,7 +61,7 @@ started()
vtysh_b () vtysh_b ()
{ {
# Rember, that all variables have been incremented by 1 in convert_daemon_prios() # Rember, that all variables have been incremented by 1 in convert_daemon_prios()
if [ "$vtysh_enable" = 2 -a -f $C_PATH/Frr.conf ]; then if [ "$vtysh_enable" = 2 -a -f $C_PATH/frr.conf ]; then
/usr/bin/vtysh -b -n /usr/bin/vtysh -b -n
fi fi
} }
@ -73,7 +73,7 @@ vtysh_b ()
check_daemon() check_daemon()
{ {
# If the integrated config file is used the others are not checked. # If the integrated config file is used the others are not checked.
if [ -r "$C_PATH/Frr.conf" ]; then if [ -r "$C_PATH/frr.conf" ]; then
return 0 return 0
fi fi
@ -543,10 +543,10 @@ case "$1" in
reload) reload)
# Just apply the commands that have changed, no restart necessary # Just apply the commands that have changed, no restart necessary
[ ! -x "$RELOAD_SCRIPT" ] && echo "frr-reload script not available" && exit 0 [ ! -x "$RELOAD_SCRIPT" ] && echo "frr-reload script not available" && exit 0
NEW_CONFIG_FILE="${2:-$C_PATH/Frr.conf}" NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}"
[ ! -r $NEW_CONFIG_FILE ] && echo "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1 [ ! -r $NEW_CONFIG_FILE ] && echo "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1
echo "Applying only incremental changes to running configuration from Frr.conf" echo "Applying only incremental changes to running configuration from frr.conf"
"$RELOAD_SCRIPT" --reload /etc/frr/Frr.conf "$RELOAD_SCRIPT" --reload /etc/frr/frr.conf
exit $? exit $?
;; ;;

6
tools/frr-reload.py
View File

@ -488,7 +488,7 @@ def line_to_vtysh_conft(ctx_keys, line, delete):
def line_for_vtysh_file(ctx_keys, line, delete): def line_for_vtysh_file(ctx_keys, line, delete):
""" """
Return the command as it would appear in Frr.conf Return the command as it would appear in frr.conf
""" """
cmd = [] cmd = []
@ -859,7 +859,7 @@ if __name__ == '__main__':
parser.add_argument('--debug', action='store_true', help='Enable debugs', default=False) parser.add_argument('--debug', action='store_true', help='Enable debugs', default=False)
parser.add_argument('--stdout', action='store_true', help='Log to STDOUT', default=False) parser.add_argument('--stdout', action='store_true', help='Log to STDOUT', default=False)
parser.add_argument('filename', help='Location of new frr config file') parser.add_argument('filename', help='Location of new frr config file')
parser.add_argument('--overwrite', action='store_true', help='Overwrite Frr.conf with running config output', default=False) parser.add_argument('--overwrite', action='store_true', help='Overwrite frr.conf with running config output', default=False)
args = parser.parse_args() args = parser.parse_args()
# Logging # Logging
@ -1081,5 +1081,5 @@ if __name__ == '__main__':
os.unlink(filename) os.unlink(filename)
# Make these changes persistent # Make these changes persistent
if args.overwrite or args.filename != '/etc/frr/Frr.conf': if args.overwrite or args.filename != '/etc/frr/frr.conf':
subprocess.call(['/usr/bin/vtysh', '-c', 'write']) subprocess.call(['/usr/bin/vtysh', '-c', 'write'])

2
tools/frr.service
View File

@ -17,6 +17,6 @@ Restart=on-abnormal
LimitNOFILE=1024 LimitNOFILE=1024
ExecStart=/usr/lib/frr/frr start ExecStart=/usr/lib/frr/frr start
ExecStop=/usr/lib/frr/frr stop ExecStop=/usr/lib/frr/frr stop
ExecReload=/usr/lib/frr/frr-reload.py --reload /etc/frr/Frr.conf ExecReload=/usr/lib/frr/frr-reload.py --reload /etc/frr/frr.conf
[Install] [Install]
WantedBy=network-online.target WantedBy=network-online.target

2
vtysh/vtysh.c
View File

@ -2573,7 +2573,7 @@ DEFUN (vtysh_write_memory,
fprintf (stdout, "Note: this version of vtysh never writes vtysh.conf\n"); fprintf (stdout, "Note: this version of vtysh never writes vtysh.conf\n");
/* If integrated Frr.conf explicitely set. */ /* If integrated frr.conf explicitely set. */
if (want_config_integrated()) if (want_config_integrated())
{ {
ret = CMD_WARNING; ret = CMD_WARNING;

2
vtysh/vtysh.h
View File

@ -49,7 +49,7 @@ DECLARE_MGROUP(MVTYSH)
/* vtysh local configuration file. */ /* vtysh local configuration file. */
#define VTYSH_DEFAULT_CONFIG "vtysh.conf" #define VTYSH_DEFAULT_CONFIG "vtysh.conf"
#define FRR_DEFAULT_CONFIG "Frr.conf" #define FRR_DEFAULT_CONFIG "frr.conf"
enum vtysh_write_integrated { enum vtysh_write_integrated {
WRITE_INTEGRATED_UNSPECIFIED, WRITE_INTEGRATED_UNSPECIFIED,

4
vtysh/vtysh_main.c
View File

@ -151,7 +151,7 @@ usage (int status)
"-m, --markfile Mark input file with context end\n" \ "-m, --markfile Mark input file with context end\n" \
" --vty_socket Override vty socket path\n" \ " --vty_socket Override vty socket path\n" \
" --config_dir Override config directory path\n" \ " --config_dir Override config directory path\n" \
"-w, --writeconfig Write integrated config (Frr.conf) and exit\n" \ "-w, --writeconfig Write integrated config (frr.conf) and exit\n" \
"-h, --help Display this help and exit\n\n" \ "-h, --help Display this help and exit\n\n" \
"Note that multiple commands may be executed from the command\n" \ "Note that multiple commands may be executed from the command\n" \
"line by passing multiple -c args, or by embedding linefeed\n" \ "line by passing multiple -c args, or by embedding linefeed\n" \
@ -355,7 +355,7 @@ main (int argc, char **argv, char **env)
strlcat(vtysh_config_always, vtysh_configfile_name, strlcat(vtysh_config_always, vtysh_configfile_name,
sizeof(vtysh_config_always)); sizeof(vtysh_config_always));
/* /*
* Overwrite location for Frr.conf * Overwrite location for frr.conf
*/ */
vtysh_configfile_name = strrchr(FRR_DEFAULT_CONFIG, '/'); vtysh_configfile_name = strrchr(FRR_DEFAULT_CONFIG, '/');
if (vtysh_configfile_name) if (vtysh_configfile_name)

2
watchfrr/watchfrr_vty.c
View File

@ -35,7 +35,7 @@ DEFUN(config_write_integrated,
config_write_integrated_cmd, config_write_integrated_cmd,
"write integrated", "write integrated",
"Write running configuration to memory, network, or terminal\n" "Write running configuration to memory, network, or terminal\n"
"Write integrated all-daemon Frr.conf file\n") "Write integrated all-daemon frr.conf file\n")
{ {
pid_t child; pid_t child;
sigset_t oldmask, sigmask; sigset_t oldmask, sigmask;