From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Fri, 30 Jun 2023 09:58:32 +0000 (+0300)
Subject: tools: Ignore errors for frr reload stuff
X-Git-Tag: docker/9.0.4~7^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6b2e944f79467149b1c5519d78af7da156dd11fc;p=matthieu%2Ffrr.git

tools: Ignore errors for frr reload stuff

When we pass an unknown/wrong command and do `systemctl reload frr`, all processes
are killed, and not started up.

Like doing with frr-reload.py, all good:

```
$ /usr/lib/frr/frr-reload.py --reload /etc/frr/frr.conf
vtysh failed to process new configuration: vtysh (mark file) exited with status 2:
b'line 20: % Unknown command:  neighbor 192.168.10.123 bfd 300 300\n\n'
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 243e27abccf8d02caabc6ae1ea758c4bdc3069e2)
---

diff --git a/tools/frrinit.sh.in b/tools/frrinit.sh.in
index 42adefb9ea..428d57c55b 100644
--- a/tools/frrinit.sh.in
+++ b/tools/frrinit.sh.in
@@ -123,7 +123,7 @@ reload)
 	NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}"
 	[ ! -r $NEW_CONFIG_FILE ] && log_failure_msg "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1
 	"$RELOAD_SCRIPT" --reload --bindir "$B_PATH" --confdir "$C_PATH" --rundir "$V_PATH" "$NEW_CONFIG_FILE" `echo $nsopt`
-	exit $?
+	exit 0
 	;;
 
 *)