diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-02-10 14:14:10 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-02-10 21:07:05 +0100 |
| commit | 6dbef6e7e0ec78f55b860bb2de37a3fdc3558831 (patch) | |
| tree | 159ab4fc2da72f8739f30a92beb24063c5cc7bfe /vtysh | |
| parent | lib: Add library code to interact with systemd (diff) | |
| download | frr-6dbef6e7e0ec78f55b860bb2de37a3fdc3558831.tar.xz frr-6dbef6e7e0ec78f55b860bb2de37a3fdc3558831.zip | |
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')
| -rw-r--r-- | vtysh/vtysh_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 033b273e5..befc86e6e 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); |