On 01/18/2018 10:44 AM, kapeka wrote: > Hi Tom > > On Mi, 2018-01-17 at 14:37 -0800, Tom Eastep wrote: >> Shorewall 5.1.11 is now available for download. > > When trying to upgrade shorewall I ran into an error with busybox > > # shorewall restart > find: unrecognized: -quit > BusyBox v1.27.2 (2018-01-09 17:45:56 CET) multi-call binary. > .... > > Let me know if you need more info. >
Hi KP, Here's a patch -- please let me know if this corrects the problem. -Tom -- Tom Eastep \ Q: What do you get when you cross a mobster with Shoreline, \ an international standard? Washington, USA \ A: Someone who makes you an offer you can't http://shorewall.org \ understand \_______________________________________________
From b2366bc1122329f235db91c22a997c6b2183ea10 Mon Sep 17 00:00:00 2001
From: Tuomo Soini <t...@foobar.fi>
Date: Wed, 23 Aug 2017 19:02:58 +0300
Subject: [PATCH] lib.common: only resolve module file names when insmod is
used
Signed-off-by: Tuomo Soini <t...@foobar.fi>
---
Shorewall-core/lib.common | 69 +++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 36 deletions(-)
diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common
index 5ec4ba8..eeb1409 100644
--- a/Shorewall-core/lib.common
+++ b/Shorewall-core/lib.common
@@ -269,53 +269,50 @@ loadmodule() # $1 = module name, $2 - * arguments
{
local modulename
modulename=$1
+ shift
+ local moduleoptions
+ moduleoptions=$*
local modulefile
local suffix
if [ -d /sys/module/ ]; then
if ! list_search $modulename $DONT_LOAD; then
- if [ ! -f /sys/module/$modulename ]; then
- shift
-
+ if [ ! -d /sys/module/$modulename ]; then
+ 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 directory in $moduledirectories; do
- modulefile=$directory/${modulename}.${suffix}
-
+ for directory in $moduledirectories; do
+ modulefile=$directory/${modulename}.${suffix}
if [ -f $modulefile ]; then
- case $moduleloader in
- insmod)
- insmod $modulefile $*
- ;;
- *)
- modprobe $modulename $*
- ;;
- esac
+ insmod $modulefile $moduleoptions
break 2
fi
done
done
- fi
- fi
- elif ! list_search $modulename $DONT_LOAD $MODULES; then
- shift
-
- 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
+ ;;
+ *)
+ modprobe $modulename $moduleoptions
+ ;;
+ esac
fi
}
--
1.8.3.1
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Shorewall-users mailing list Shorewall-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-users
