extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-27 21:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.4.23

Browse Source
This commit is contained in:
Tom Eastep 2011-09-13 07:43:33 -07:00
commit 55129204ac
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Shorewall/lib.common
View File

@ -226,26 +226,28 @@ loadmodule() # $1 = module name, $2 - * arguments
local suffix local suffix
if [ -d /sys/module/ ]; then if [ -d /sys/module/ ]; then
if [ ! -d /sys/module/$modulename ]; then if ! list_search $modulename $DONT_LOAD; then
shift if [ ! -d /sys/module/$modulename ]; then
shift
for suffix in $MODULE_SUFFIX ; do for suffix in $MODULE_SUFFIX ; do
for directory in $moduledirectories; do for directory in $moduledirectories; do
modulefile=$directory/${modulename}.${suffix} modulefile=$directory/${modulename}.${suffix}
if [ -f $modulefile ]; then if [ -f $modulefile ]; then
case $moduleloader in case $moduleloader in
insmod) insmod)
insmod $modulefile $* insmod $modulefile $*
;; ;;
*) *)
modprobe $modulename $* modprobe $modulename $*
;; ;;
esac esac
break 2 break 2
fi fi
done
done done
done fi
fi fi
elif ! list_search $modulename $DONT_LOAD $MODULES; then elif ! list_search $modulename $DONT_LOAD $MODULES; then
shift shift

36
Shorewall6/lib.common
View File

@ -248,26 +248,28 @@ loadmodule() # $1 = module name, $2 - * arguments
local suffix local suffix
if [ -d /sys/module/ ]; then if [ -d /sys/module/ ]; then
if [ ! -d /sys/module/$modulename ]; then if ! list_search $modulename $DONT_LOAD; then
shift if [ ! -d /sys/module/$modulename ]; then
shift
for suffix in $MODULE_SUFFIX ; do for suffix in $MODULE_SUFFIX ; do
for directory in $moduledirectories; do for directory in $moduledirectories; do
modulefile=$directory/${modulename}.${suffix} modulefile=$directory/${modulename}.${suffix}
if [ -f $modulefile ]; then if [ -f $modulefile ]; then
case $moduleloader in case $moduleloader in
insmod) insmod)
insmod $modulefile $* insmod $modulefile $*
;; ;;
*) *)
modprobe $modulename $* modprobe $modulename $*
;; ;;
esac esac
break 2 break 2
fi fi
done
done done
done fi
fi fi
elif ! list_search $modulename $MODULES $DONT_LOAD ; then elif ! list_search $modulename $MODULES $DONT_LOAD ; then
shift shift