File wanpipe-02-no-hardcoded-paths.diff of Package wanpipe
From: Jan Engelhardt <jengelh@medozas.de>
Upstream: not sure
Disable path checks since they are not needed. modprobe will
automatically select the right ones.
---
samples/wanrouter | 70 ++++++++----------------------------------------------
1 file changed, 11 insertions(+), 59 deletions(-)
Index: wanpipe-3.5.27.4/samples/wanrouter
===================================================================
--- wanpipe-3.5.27.4.orig/samples/wanrouter
+++ wanpipe-3.5.27.4/samples/wanrouter
@@ -425,24 +425,6 @@ echo "Error: Your securelevel does not a
fi
fi
- for i in $MODULES
- do
-
- module_name=$i$MODULE_EXT
- if [ ! -f $module_name ]; then
- if [ $OSYSTEM = "Linux" ]; then
- eval "echo $OPT_MODULES | grep $i > /dev/null 2> /dev/null"
- if [ $? -ne 0 ]; then
- mod_error $i
- return 1
- fi
- else
- mod_error $i
- return 1
- fi
- fi
- done
-
[ "$ROUTER_BOOT" = "NO" -o -z "$WAN_DRIVERS" ] && {
echo -e "\n\nERROR in $WAN_CONF_DIR/wanrouter.rc file !!!"
@@ -1061,11 +1043,6 @@ wanec_config ()
return 0
fi
- file_exist $MOD10
- if [ $? -ne 0 ]; then
- return 0
- fi
-
if [ $opt = UNLOAD ]; then
lsmods=`$MODULE_STAT`
@@ -1109,11 +1086,6 @@ lip_config ()
return 0
fi
- file_exist $MOD9
- if [ $? -ne 0 ]; then
- return 0
- fi
-
if [ $opt = UNLOAD ]; then
lsmods=`$MODULE_STAT`
@@ -1503,11 +1475,6 @@ wansock_config ()
return 0
fi
- file_exist $MOD5
- if [ $? -ne 0 ]; then
- return 0
- fi
-
if [ $DEPMOD != YES ]; then
return 0
fi
@@ -1534,21 +1501,6 @@ annexg_config ()
return 0
fi
- file_exist $MOD6
- if [ $? -ne 0 ]; then
- return 0
- fi
-
- file_exist $MOD7
- if [ $? -ne 0 ]; then
- return 0
- fi
-
- file_exist $MOD8
- if [ $? -ne 0 ]; then
- return 0
- fi
-
if [ $DEPMOD != YES ]; then
return 0
fi
@@ -2286,19 +2238,19 @@ init_global_params()
uname -r | grep "^2.6.*" > /dev/null
if [ $? -eq 0 ]; then
if [ -d /lib/modules/$(uname -r)/kernel ]; then
- MOD1=/lib/modules/$(uname -r)/kernel/drivers/net/wan/sdladrv
- MOD2=/lib/modules/$(uname -r)/kernel/net/wanrouter/wanrouter
- MOD3=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe_syncppp
- MOD4=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe
- MOD5=/lib/modules/$(uname -r)/kernel/net/wanrouter/af_wanpipe
-
- MOD6=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe_lapb
- MOD7=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe_x25
- MOD8=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe_dsp
+ MOD1=sdladrv
+ MOD2=wanrouter
+ MOD3=wanpipe_syncppp
+ MOD4=wanpipe
+ MOD5=af_wanpipe
+
+ MOD6=wanpipe_lapb
+ MOD7=wanpipe_x25
+ MOD8=wanpipe_dsp
- MOD9=/lib/modules/$(uname -r)/kernel/net/wanrouter/wanpipe_lip
+ MOD9=wanpipe_lip
WANPIPE_LIP_MOD_DIR=/lib/modules/$(uname -r)/kernel/net/wanrouter
- MOD10=/lib/modules/$(uname -r)/kernel/net/wanrouter/wanec
+ MOD10=wanec
WANEC_MOD_DIR=/lib/modules/$(uname -r)/kernel/net/wanrouter
fi
else