beautysh: re-format
beautysh is enabled in the openbmc-build-scripts on Bash/Zsh/POSIX-sh
files to have a consistent formatting. Re-run the formatter on the
whole repository.
Change-Id: I6a61656dd6033329cba124ac0754152cbd1e9de3
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/subprojects/ncsid/src/update_ra_neighbor.sh b/subprojects/ncsid/src/update_ra_neighbor.sh
index 1fb6b58..8d0a3c9 100644
--- a/subprojects/ncsid/src/update_ra_neighbor.sh
+++ b/subprojects/ncsid/src/update_ra_neighbor.sh
@@ -15,50 +15,50 @@
source "$(dirname "${BASH_SOURCE[0]}")"/ncsid_lib.sh
-UpdateRA() {
- local netdev="$1"
+function UpdateRA() {
+ local netdev="$1"
- local service='xyz.openbmc_project.Network'
- local gateways
- if ! gateways="$(GetGateways "$service" "$netdev")"; then
- echo "Failed to look up gateways" >&2
- return 1
- fi
- local vars
- vars="$(echo "$gateways" | JSONToVars)" || return
- eval "$vars" || return
+ local service='xyz.openbmc_project.Network'
+ local gateways
+ if ! gateways="$(GetGateways "$service" "$netdev")"; then
+ echo "Failed to look up gateways" >&2
+ return 1
+ fi
+ local vars
+ vars="$(echo "$gateways" | JSONToVars)" || return
+ eval "$vars" || return
- echo "GW($netdev): ${DefaultGateway6:-(none)}" >&2
- if [ -z "$DefaultGateway6" ]; then
- return 0
- fi
+ echo "GW($netdev): ${DefaultGateway6:-(none)}" >&2
+ if [ -z "$DefaultGateway6" ]; then
+ return 0
+ fi
- local st=0
- local disc
- CaptureInterruptible disc DiscoverRouter6 "$netdev" -1 360000 "$DefaultGateway6" || st=$?
- if (( st != 0 )); then
- echo "Failed to discover router" >&2
- return 1
- fi
- local vars
- vars="$(echo "$disc" | JSONToVars)" || return
- eval "$vars" || return
- echo "GW($netdev) MAC: $router_mac" >&2
+ local st=0
+ local disc
+ CaptureInterruptible disc DiscoverRouter6 "$netdev" -1 360000 "$DefaultGateway6" || st=$?
+ if (( st != 0 )); then
+ echo "Failed to discover router" >&2
+ return 1
+ fi
+ local vars
+ vars="$(echo "$disc" | JSONToVars)" || return
+ eval "$vars" || return
+ echo "GW($netdev) MAC: $router_mac" >&2
- SuppressTerm
- local rc=0
- UpdateNeighbor "$service" "$netdev" "$router_ip" "$router_mac" || rc=$?
- UnsuppressTerm
- return $rc
+ SuppressTerm
+ local rc=0
+ UpdateNeighbor "$service" "$netdev" "$router_ip" "$router_mac" || rc=$?
+ UnsuppressTerm
+ return $rc
}
-Main() {
- set -o nounset
- set -o errexit
- set -o pipefail
+function Main() {
+ set -o nounset
+ set -o errexit
+ set -o pipefail
- InitTerm
- UpdateRA "$@"
+ InitTerm
+ UpdateRA "$@"
}
return 0 2>/dev/null