From 2adac27806ebdedebc13f15e255fc83feced3928 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 10 Mar 2007 05:02:03 +0000
Subject: [PATCH] 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
---
 New/compiler.pl | 2 +-
 New/lib.config  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/New/compiler.pl b/New/compiler.pl
index 997c593be..21fd4cd57 100755
--- a/New/compiler.pl
+++ b/New/compiler.pl
@@ -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 ;
     }
 
diff --git a/New/lib.config b/New/lib.config
index cc1d65ab0..fed139477 100644
--- a/New/lib.config
+++ b/New/lib.config
@@ -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