7f9077012c
- use openwrt locations for utilities, fixes compilation on systems missing those utilites, allows ipkungfu to run - $(INSTALL_BIN) to properly install binaries - rewrite to use insmod in place of modprobe - depends on bash - delete autogenerated md5sum manifsts during removal, fixes reinstallation/upgrades - needs more work, but this is a start and prevents error during compilation git-svn-id: svn://svn.openwrt.org/openwrt/packages@12083 3c298f89-4303-0410-b956-a3cf2f4a3e73
23 lines
1014 B
Diff
23 lines
1014 B
Diff
Index: ipkungfu-0.6.1/ipkungfu.in
|
|
===================================================================
|
|
--- ipkungfu-0.6.1.orig/ipkungfu.in 2007-01-21 19:47:04.000000000 -0800
|
|
+++ ipkungfu-0.6.1/ipkungfu.in 2008-08-03 11:41:13.000000000 -0700
|
|
@@ -618,7 +618,7 @@
|
|
# they're built in.
|
|
DEFAULT_MODULES_LIST="ip_nat_irc ip_conntrack_ftp ip_nat_ftp ip_conntrack_irc"
|
|
for default_module in $DEFAULT_MODULES_LIST; do
|
|
- if [ -f $($MODPROBE -la | grep ${default_module}) ]; then
|
|
+ if [ -f $(find /lib/modules/$(uname -r) -name "${default_module}*") ]; then
|
|
$MODPROBE ${default_module} 2>&1 | logError
|
|
fi
|
|
done
|
|
@@ -627,7 +627,7 @@
|
|
MODULES_ARRAY=(${MODULES_LIST})
|
|
|
|
for module in ${MODULES_ARRAY[@]}; do
|
|
- if [ -e /lib/modules/`uname -r`/kernel/net/ipv4/netfilter/${module}* ]; then
|
|
+ if [ -e /lib/modules/`uname -r`/${module}* ]; then
|
|
if [ -z "`${LSMOD} | grep ${module}`" ] ; then
|
|
if [ $INIT != 1 ] ; then
|
|
echo -n -e "Loading ${BRIGHT_COLOUR}${module}${CLOSE_COLOUR} module..."
|