extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 17:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix IPSETS_SAVE=Yes problem with 'save'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4879 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-11-15 04:16:59 +00:00
parent 1447b53d84
commit 3a1191f1df
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/lib.base
View File

@ -267,6 +267,11 @@ load_kernel_modules()
MODULES=$(lsmod | cut -d ' ' -f1) MODULES=$(lsmod | cut -d ' ' -f1)
progress_message "Loading Modules..." progress_message "Loading Modules..."
. $modules . $modules
echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir
cp -f $modules ${VARDIR}/.modules
else
> ${VARDIR}/.modulesdir
> ${VARDIR}/.modules
fi fi
MODULESDIR=$save_modules_dir MODULESDIR=$save_modules_dir

7
Shorewall/lib.cli
View File

@ -265,7 +265,7 @@ save_config() {
echo " ERROR: $RESTOREPATH exists and is not a saved $PRODUCT configuration" echo " ERROR: $RESTOREPATH exists and is not a saved $PRODUCT configuration"
else else
case $RESTOREFILE in case $RESTOREFILE in
save|restore-base) save)
echo " ERROR: Reserved file name: $RESTOREFILE" echo " ERROR: Reserved file name: $RESTOREFILE"
;; ;;
*) *)
@ -291,9 +291,10 @@ save_config() {
echo >> $f echo >> $f
echo ". ${SHAREDIR}/lib.base" >> $f echo ". ${SHAREDIR}/lib.base" >> $f
echo >> $f echo >> $f
grep '^MODULE' ${VARDIR}/restore-base >> $f cat ${VARDIR}/.modulesdir >> $f
echo >> $f
echo "reload_kernel_modules << __EOF__" >> $f echo "reload_kernel_modules << __EOF__" >> $f
grep 'loadmodule ip_set' ${VARDIR}/restore-base >> $f grep 'loadmodule ip_set' ${VARDIR}/.modules >> $f
echo "__EOF__" >> $f echo "__EOF__" >> $f
echo >> $f echo >> $f
echo "ipset -U :all: :all:" >> $f echo "ipset -U :all: :all:" >> $f