diff --git a/Shorewall/Perl/prog.header b/Shorewall/Perl/prog.header index afb84324b..c8ab86a94 100644 --- a/Shorewall/Perl/prog.header +++ b/Shorewall/Perl/prog.header @@ -1208,6 +1208,10 @@ run_it() { local options local version + export CONFDIR + export SHAREDIR + export VARDIR + script=$1 shift @@ -1233,7 +1237,7 @@ run_it() { fi else # - # 4.4.8 or later -- no exports required + # 4.4.8 or later -- no additional exports required # options='-' @@ -1246,7 +1250,7 @@ run_it() { [ -n "$RESTOREFILE" ] && options="${options} -R $RESTOREFILE" fi - + $SHOREWALL_SHELL $script $options $@ } diff --git a/Shorewall/Perl/prog.header6 b/Shorewall/Perl/prog.header6 index ea99e2047..a725d10f2 100644 --- a/Shorewall/Perl/prog.header6 +++ b/Shorewall/Perl/prog.header6 @@ -1051,7 +1051,7 @@ get_script_version() { # $1 = script # -# Do required exports or create the required option string and run the passed script using +# Do required exports and create the required option string and run the passed script using # $SHOREWALL_SHELL # run_it() { @@ -1059,6 +1059,10 @@ run_it() { local options local version + export CONFDIR + export SHAREDIR + export VARDIR + script=$1 shift @@ -1084,7 +1088,7 @@ run_it() { fi else # - # 4.4.8 or later -- no exports required + # 4.4.8 or later -- no additional exports required # options='-' @@ -1097,7 +1101,7 @@ run_it() { [ -n "$RESTOREFILE" ] && options="${options} -R $RESTOREFILE" fi - + $SHOREWALL_SHELL $script $options $@ } diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli index 3ffd18721..b6a34850b 100644 --- a/Shorewall/lib.cli +++ b/Shorewall/lib.cli @@ -69,6 +69,10 @@ run_it() { local options local version + export CONFDIR + export SHAREDIR + export VARDIR + script=$1 shift @@ -94,7 +98,7 @@ run_it() { fi else # - # 4.4.8 or later -- no exports required + # 4.4.8 or later -- no additional exports required # options='-' diff --git a/Shorewall6/lib.cli b/Shorewall6/lib.cli index e4be09232..4c4e60820 100644 --- a/Shorewall6/lib.cli +++ b/Shorewall6/lib.cli @@ -61,7 +61,7 @@ get_script_version() { # $1 = script } # -# Do required exports or create the required option string and run the passed script using +# Do required exports and create the required option string and run the passed script using # $SHOREWALL_SHELL # run_it() { @@ -69,6 +69,10 @@ run_it() { local options local version + export CONFDIR + export SHAREDIR + export VARDIR + script=$1 shift @@ -94,7 +98,7 @@ run_it() { fi else # - # 4.4.8 or later -- no exports required + # 4.4.8 or later -- no additional exports required # options='-' @@ -107,7 +111,7 @@ run_it() { [ -n "$RESTOREFILE" ] && options="${options} -R $RESTOREFILE" fi - + $SHOREWALL_SHELL $script $options $@ }