From 0a06fc0571fbfeb25855f1741f577e6579465434 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 17 Sep 2024 06:52:22 +0200 Subject: [PATCH] confd: minor, logging and coding style - Remove duplicate logs due to logger logging also to stderr - Fix coding style in new test-override-startup code path Signed-off-by: Joachim Wiberg --- src/confd/bin/load | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/confd/bin/load b/src/confd/bin/load index 57dbce2b..cdc985a7 100755 --- a/src/confd/bin/load +++ b/src/confd/bin/load @@ -28,12 +28,12 @@ perms() note() { - logger -s -I $$ -p user.notice -t load "$*" + logger -I $$ -p user.notice -t load "$*" } err() { - logger -s -I $$ -p user.error -t load "$*" + logger -I $$ -p user.error -t load "$*" } @@ -60,12 +60,12 @@ config=$1 if [ -f "/mnt/aux/test-mode" ] && [ "$config" = "startup-config" ]; then - if [ -f "/mnt/aux/test-override-startup" ]; then - rm -f "/mnt/aux/test-override-startup" - else + if [ -f "/mnt/aux/test-override-startup" ]; then + rm -f "/mnt/aux/test-override-startup" + else note "Test mode detected, switching to test-config" config="test-config" - fi + fi fi if [ -f "$config" ]; then