From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Wed, 13 Apr 2016 20:54:30 +0000 (+0000)
Subject: 'systemctl restart zebra' was blocking if the BGP ASN changed due to
X-Git-Tag: frr-2.0-rc1~967^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b1d19577a00f16e5e042cf356002fb1f93588752;p=matthieu%2Ffrr.git

'systemctl restart zebra' was blocking if the BGP ASN changed due to
restarting bgpd

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/tools/quagga-reload.py b/tools/quagga-reload.py
index 7ab59c49f4..428b12e931 100755
--- a/tools/quagga-reload.py
+++ b/tools/quagga-reload.py
@@ -707,4 +707,5 @@ if __name__ == '__main__':
                     os.unlink(filename)
 
             if restart_bgp:
-                subprocess.call(['sudo', 'systemctl', 'restart', 'bgpd'])
+                subprocess.call(['sudo', 'systemctl', 'reset-failed', 'bgpd'])
+                subprocess.call(['sudo', 'systemctl', '--no-block', 'restart', 'bgpd'])