From 7a54c565311bab0e856b7401344f1873dd0c88f9 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 26 Apr 2020 13:49:53 +0200 Subject: [PATCH] fff-gateway: Use return for errors in config version check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The concept of configuregateway is to respond on the return codes of the gateway.d files, and exit if anyone returns something different than zero. Thus, let's not exit in gateway.d files directly, but stick to that logic and return 1. Signed-off-by: Adrian Schmutzler Reviewed-by: Robert Langhammer Reviewed-by: Fabian Bläse --- src/packages/fff/fff-gateway/files/etc/gateway.d/01-version | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version index 41c3cf7..8c96767 100644 --- a/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version +++ b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version @@ -3,7 +3,7 @@ configure() { if ! uci -q show gateway > /dev/null; then echo "ERROR: Gateway config could not be parsed or does not exist." - exit 1 + return 1 fi # check version of configuration @@ -13,14 +13,14 @@ configure() { if ! [ -n "$config_version" ]; then echo "ERROR: No config version given. Supported versions: '$expected_version'" - exit 1 + return 1 fi if [ "$config_version" != "$expected_version" ]; then echo "ERROR: Invalid config version. Expected '$expected_version', got '$config_version'." echo "Please check what has been changed and adjust your config appropriately." - exit 1 + return 1 fi return 0