mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-15 12:14:32 +01:00
Auto export variables set in params file; downgrade missing param to a warning
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5482 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
b7bb78c03d
commit
2adac27806
@ -3442,7 +3442,7 @@ sub expand_shell_variables( $ ) {
|
||||
my $line = $_[0];
|
||||
|
||||
while ( $line =~ /^(.*?)\$([a-zA-Z]\w*)(.*)$/ ) {
|
||||
fatal_error "Shell variable \$$2 not found" unless $ENV{$2};
|
||||
warning_message "Shell variable \$$2 not found" unless $ENV{$2};
|
||||
$line = $1 . $ENV{$2} . $3 ;
|
||||
}
|
||||
|
||||
|
@ -1858,8 +1858,12 @@ do_initialize() {
|
||||
|
||||
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
|
||||
|
||||
set -a
|
||||
|
||||
run_user_exit params
|
||||
|
||||
set +a
|
||||
|
||||
config=$(find_file shorewall.conf)
|
||||
|
||||
if [ -f $config ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user