summaryrefslogtreecommitdiff
path: root/vtysh/vtysh_main.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-02-10 08:14:10 -0500
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-02-10 15:07:05 -0500
commit6dbef6e7e0ec78f55b860bb2de37a3fdc3558831 (patch)
tree159ab4fc2da72f8739f30a92beb24063c5cc7bfe /vtysh/vtysh_main.c
parentddd82ff66cd6092b1d99dcf6013b97a1620f6d53 (diff)
vtysh: Modify -b option to work with -n option
If there is no Quagga.conf file and the -b option has been specified, the vtysh -b file is erroring out and failing. Modify the code to use -n in conjunction of -b and to not error out in this situation. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'vtysh/vtysh_main.c')
-rw-r--r--vtysh/vtysh_main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 033b273e58..befc86e6e2 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -451,7 +451,10 @@ main (int argc, char **argv, char **env)
{
fprintf (stderr, "Can't open configuration file [%s]\n",
integrate_default);
- exit (1);
+ if (no_error)
+ exit (0);
+ else
+ exit (1);
}
else
exit (0);