From 8dce87e129bd62b6d8b92c0e101776296f65a625 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 19 Dec 2016 10:26:33 -0800 Subject: [PATCH] Revert "core: Don't set the 'file' var needlessly" This reverts commit eaf58d18aa68b3526a44ecd9350547d9129e5450. --- Shorewall-core/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh index 77e8124a5..e09427944 100755 --- a/Shorewall-core/install.sh +++ b/Shorewall-core/install.sh @@ -149,10 +149,13 @@ done if [ $# -eq 0 ]; then if [ -f ./shorewallrc ]; then . ./shorewallrc + file=./shorewallrc elif [ -f ~/.shorewallrc ]; then . ~/.shorewallrc || exit 1 + file=~/.shorewallrc elif [ -f /usr/share/shorewall/shorewallrc ]; then . /usr/share/shorewall/shorewallrc + file=/usr/share/shorewall/shorewallrc else fatal_error "No configuration file specified and /usr/share/shorewall/shorewallrc not found" fi