mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-15 07:38:43 +00:00
Code Releases Activity

Merge branch 'int-new' into mq-coro

Browse Source
This commit is contained in:
Jan Maria Matejka 2018-08-28 16:49:28 +02:00
commit 7bea21ac84
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/bird.sgml
View File

@ -653,7 +653,7 @@ agreement").
<tag><label id="proto-description">description "<m/text/"</tag> <tag><label id="proto-description">description "<m/text/"</tag>
This is an optional description of the protocol. It is displayed as a This is an optional description of the protocol. It is displayed as a
part of the output of 'show route all' command. part of the output of 'show protocols all' command.
<tag><label id="proto-vrf">vrf "<m/text/"</tag> <tag><label id="proto-vrf">vrf "<m/text/"</tag>
Associate the protocol with specific VRF. The protocol will be Associate the protocol with specific VRF. The protocol will be

10
sysdep/unix/main.c
View File

@ -530,7 +530,7 @@ signal_init(void)
* Parsing of command-line arguments * Parsing of command-line arguments
*/ */
static char *opt_list = "c:dD:ps:P:u:g:flRh"; static char *opt_list = "bc:dD:ps:P:u:g:flRh";
static int parse_and_exit; static int parse_and_exit;
char *bird_name; char *bird_name;
static char *use_user; static char *use_user;
@ -551,6 +551,7 @@ display_help(void)
fprintf(stderr, fprintf(stderr,
"\n" "\n"
"Options: \n" "Options: \n"
" -b Run bird in background\n"
" -c <config-file> Use given configuration file instead\n" " -c <config-file> Use given configuration file instead\n"
" of prefix/etc/bird.conf\n" " of prefix/etc/bird.conf\n"
" -d Enable debug messages and run bird in foreground\n" " -d Enable debug messages and run bird in foreground\n"
@ -655,16 +656,21 @@ parse_args(int argc, char **argv)
while ((c = getopt(argc, argv, opt_list)) >= 0) while ((c = getopt(argc, argv, opt_list)) >= 0)
switch (c) switch (c)
{ {
case 'b':
run_in_foreground = 0;
break;
case 'c': case 'c':
config_name = optarg; config_name = optarg;
config_changed = 1; config_changed = 1;
break; break;
case 'd': case 'd':
debug_flag |= 1; debug_flag |= 1;
run_in_foreground = 1;
break; break;
case 'D': case 'D':
log_init_debug(optarg); log_init_debug(optarg);
debug_flag |= 2; debug_flag |= 2;
run_in_foreground = 1;
break; break;
case 'p': case 'p':
parse_and_exit = 1; parse_and_exit = 1;
@ -763,7 +769,7 @@ main(int argc, char **argv)
if (parse_and_exit) if (parse_and_exit)
exit(0); exit(0);
if (!(debug_flag||run_in_foreground)) if (!run_in_foreground)
{ {
pid_t pid = fork(); pid_t pid = fork();
if (pid < 0) if (pid < 0)