extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-18 23:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Auto export variables set in params file; downgrade missing param to a warning

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5482 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-10 05:02:03 +00:00
parent b7bb78c03d
commit 2adac27806
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
New/compiler.pl
View File

@ -3442,7 +3442,7 @@ sub expand_shell_variables( $ ) {
my $line = $_[0]; my $line = $_[0];
while ( $line =~ /^(.*?)\$([a-zA-Z]\w*)(.*)$/ ) { 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 ; $line = $1 . $ENV{$2} . $3 ;
} }

4
New/lib.config
View File

@ -1858,8 +1858,12 @@ do_initialize() {
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE) [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
set -a
run_user_exit params run_user_exit params
set +a
config=$(find_file shorewall.conf) config=$(find_file shorewall.conf)
if [ -f $config ]; then if [ -f $config ]; then