]> git.puffer.fish Git - mirror/frr.git/commitdiff
tools: Ignore errors for frr reload stuff 16461/head
authorDonatas Abraitis <donatas@opensourcerouting.org>
Fri, 30 Jun 2023 09:58:32 +0000 (12:58 +0300)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Wed, 24 Jul 2024 19:52:36 +0000 (19:52 +0000)
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)

tools/frrinit.sh.in

index 42adefb9eae1b90d89933c8342b2de7d9fcf81c1..428d57c55b3d29f7668a42adae5de838c8d1d8bf 100644 (file)
@@ -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
        ;;
 
 *)