holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Better fix for missing $VARDIR

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5301 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-01-25 18:56:24 +00:00
parent a29f012303
commit 45bbd5413d
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-lite/shorecap
View File

@ -59,6 +59,6 @@ VERSION=$(cat /usr/share/shorewall-lite/version)
[ -n "$IPTABLES" ] || IPTABLES=$(mywhich iptables) [ -n "$IPTABLES" ] || IPTABLES=$(mywhich iptables)
VERBOSE=0 VERBOSE=0
load_kernel_modules load_kernel_modules No
determine_capabilities determine_capabilities
report_capabilities1 report_capabilities1

4
Shorewall/compiler
View File

@ -5180,10 +5180,10 @@ __EOF__
save_command_unindented EOF save_command_unindented EOF
save_command "reload_kernel_modules < \${VARDIR}/.modules" save_command "reload_kernel_modules < \${VARDIR}/.modules"
else else
save_command load_kernel_modules save_command load_kernel_modules Yes
fi fi
else else
save_command load_kernel_modules save_command load_kernel_modules Yes
fi fi
for interface in $ALL_INTERFACES; do for interface in $ALL_INTERFACES; do

11
Shorewall/lib.base
View File

@ -243,7 +243,7 @@ reload_kernel_modules() {
# #
# Load kernel modules required for Shorewall # Load kernel modules required for Shorewall
# #
load_kernel_modules() load_kernel_modules() # $1 = Yes, if we are to save moduleinfo in $VARDIR
{ {
local save_modules_dir=$MODULESDIR local save_modules_dir=$MODULESDIR
local directory local directory
@ -267,10 +267,13 @@ load_kernel_modules()
MODULES=$(lsmod | cut -d ' ' -f1) MODULES=$(lsmod | cut -d ' ' -f1)
progress_message "Loading Modules..." progress_message "Loading Modules..."
. $modules . $modules
if [ "$1" = Yes ]; then
[ -d ${VARDIR} ] || mkdir -p ${VARDIR}
echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir
cp -f $modules ${VARDIR}/.modules
fi
elif [ "$1" = Yes ]; then
[ -d ${VARDIR} ] || mkdir -p ${VARDIR} [ -d ${VARDIR} ] || mkdir -p ${VARDIR}
echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir
cp -f $modules ${VARDIR}/.modules
else
> ${VARDIR}/.modulesdir > ${VARDIR}/.modulesdir
> ${VARDIR}/.modules > ${VARDIR}/.modules
fi fi

2
Shorewall/lib.config
View File

@ -1902,7 +1902,7 @@ do_initialize() {
if [ -z "$EXPORT" -a "$(whoami)" = root ]; then if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
load_kernel_modules load_kernel_modules Yes
if [ -z "$IPTABLES" ]; then if [ -z "$IPTABLES" ]; then
IPTABLES=$(mywhich iptables 2> /dev/null) IPTABLES=$(mywhich iptables 2> /dev/null)