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

Apply Tuomo Soini's loadmodule patch

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-08-23 09:20:50 -07:00
parent 3d322d31b7
commit 6053a40af0
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Shorewall-core/lib.common
View File

@ -269,53 +269,50 @@ loadmodule() # $1 = module name, $2 - * arguments
{ {
local modulename local modulename
modulename=$1 modulename=$1
shift
local moduleoptions
moduleoptions=$*
local modulefile local modulefile
local suffix local suffix
if [ -d /sys/module/ ]; then if [ -d /sys/module/ ]; then
if ! list_search $modulename $DONT_LOAD; then if ! list_search $modulename $DONT_LOAD; then
if [ ! -f /sys/module/$modulename ]; then if [ ! -d /sys/module/$modulename ]; then
shift case $moduleloader in
insmod)
for suffix in $MODULE_SUFFIX ; do
for directory in $moduledirectories; do
modulefile=$directory/${modulename}.${suffix}
if [ -f $modulefile ]; then
insmod $modulefile $moduleoptions
break 2
fi
done
done
;;
*)
modprobe $modulename $moduleoptions
;;
esac
fi
fi
elif ! list_search $modulename $DONT_LOAD $MODULES; then
case $moduleloader in
insmod)
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 insmod $modulefile $moduleoptions
insmod)
insmod $modulefile $*
;;
*)
modprobe $modulename $*
;;
esac
break 2 break 2
fi fi
done done
done done
fi ;;
fi *)
elif ! list_search $modulename $DONT_LOAD $MODULES; then modprobe $modulename $moduleoptions
shift ;;
esac
for suffix in $MODULE_SUFFIX ; do
for directory in $moduledirectories; do
modulefile=$directory/${modulename}.${suffix}
if [ -f $modulefile ]; then
case $moduleloader in
insmod)
insmod $modulefile $*
;;
*)
modprobe $modulename $*
;;
esac
break 2
fi
done
done
fi fi
} }