From 8ca1689f1967c09d418ab68ec054f3c449a9ad45 Mon Sep 17 00:00:00 2001 From: Sid Khot Date: Tue, 16 Aug 2016 16:27:34 -0700 Subject: [PATCH] bgpd: Fix for CM-11777 Need Quagga.conf created at quagga install Ticket: CM-11777 Reviewed By: CCR-5110 Testing Done: Manual --- cumulus/etc/quagga/Quagga.conf | 2 ++ cumulus/etc/quagga/bgpd.conf | 3 --- cumulus/etc/quagga/ospf6d.conf | 3 --- cumulus/etc/quagga/ospfd.conf | 3 --- cumulus/etc/quagga/pimd.conf | 5 ----- cumulus/etc/quagga/zebra.conf | 2 -- vtysh/vtysh_main.c | 5 ++++- 7 files changed, 6 insertions(+), 17 deletions(-) create mode 100644 cumulus/etc/quagga/Quagga.conf delete mode 100644 cumulus/etc/quagga/bgpd.conf delete mode 100644 cumulus/etc/quagga/ospf6d.conf delete mode 100644 cumulus/etc/quagga/ospfd.conf delete mode 100644 cumulus/etc/quagga/pimd.conf delete mode 100644 cumulus/etc/quagga/zebra.conf diff --git a/cumulus/etc/quagga/Quagga.conf b/cumulus/etc/quagga/Quagga.conf new file mode 100644 index 0000000000..e52f3f8aab --- /dev/null +++ b/cumulus/etc/quagga/Quagga.conf @@ -0,0 +1,2 @@ +log file /var/log/quagga/quagga.log +log timestamp precision 6 diff --git a/cumulus/etc/quagga/bgpd.conf b/cumulus/etc/quagga/bgpd.conf deleted file mode 100644 index 7c9c5ae286..0000000000 --- a/cumulus/etc/quagga/bgpd.conf +++ /dev/null @@ -1,3 +0,0 @@ -hostname bgpd -log timestamp precision 6 -log file /var/log/quagga/bgpd.log diff --git a/cumulus/etc/quagga/ospf6d.conf b/cumulus/etc/quagga/ospf6d.conf deleted file mode 100644 index 408ca1af1e..0000000000 --- a/cumulus/etc/quagga/ospf6d.conf +++ /dev/null @@ -1,3 +0,0 @@ -hostname ospfd -log timestamp precision 6 -log file /var/log/quagga/ospf6d.log diff --git a/cumulus/etc/quagga/ospfd.conf b/cumulus/etc/quagga/ospfd.conf deleted file mode 100644 index 8f2e53e030..0000000000 --- a/cumulus/etc/quagga/ospfd.conf +++ /dev/null @@ -1,3 +0,0 @@ -hostname ospfd -log timestamp precision 6 -log file /var/log/quagga/ospfd.log diff --git a/cumulus/etc/quagga/pimd.conf b/cumulus/etc/quagga/pimd.conf deleted file mode 100644 index 8aa1e7f5f0..0000000000 --- a/cumulus/etc/quagga/pimd.conf +++ /dev/null @@ -1,5 +0,0 @@ -hostname pimd -password cn321 -enable password cn321 -log timestamp precision 6 -log file /var/log/quagga/pimd.log diff --git a/cumulus/etc/quagga/zebra.conf b/cumulus/etc/quagga/zebra.conf deleted file mode 100644 index 67e4799413..0000000000 --- a/cumulus/etc/quagga/zebra.conf +++ /dev/null @@ -1,2 +0,0 @@ -hostname zebra -log file /var/log/quagga/zebra.log diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 5bb3c61e52..3c46194d31 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -415,7 +415,10 @@ main (int argc, char **argv, char **env) if (vtysh_connect_all (daemon_name) <= 0) { fprintf(stderr, "Exiting: failed to connect to any daemons.\n"); - exit(1); + if (no_error) + exit(0); + else + exit(1); } if (inputfile) -- 2.39.5