aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-09-24 13:32:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-09-24 13:32:18 +0000
commit57c6e6b156f6e37071ca2e0c06d5794ed032d1cc (patch)
tree9b739c6907465a7b5413e56f44266afa6bf2a771
parent732e5d38374397673c861f49a1222280bcd1617a (diff)
downloadmaster-187ad058-57c6e6b156f6e37071ca2e0c06d5794ed032d1cc.tar.gz
master-187ad058-57c6e6b156f6e37071ca2e0c06d5794ed032d1cc.tar.bz2
master-187ad058-57c6e6b156f6e37071ca2e0c06d5794ed032d1cc.zip
use absolute paths in include() shell function
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4852 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/default/etc/functions.sh2
-rw-r--r--package/base-files/default/etc/hotplug.d/net/10-net2
-rwxr-xr-xpackage/base-files/default/etc/init.d/S40network2
-rwxr-xr-xpackage/base-files/default/sbin/ifdown2
-rwxr-xr-xpackage/base-files/default/sbin/wifi2
-rwxr-xr-xpackage/base-files/default/usr/share/udhcpc/default.script2
6 files changed, 6 insertions, 6 deletions
diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 27b0a6d5fc..ce22ed151c 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -93,7 +93,7 @@ load_modules() {
}
include() {
- for file in $(ls /lib/$1/*.sh 2>/dev/null); do
+ for file in $(ls $1/*.sh 2>/dev/null); do
. $file
done
}
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index b5140758af..0a24b052f3 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,6 +1,6 @@
# Copyright (C) 2006 OpenWrt.org
-include network
+include /lib/network
addif() {
scan_interfaces
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network
index ec290335db..f2c3e22859 100755
--- a/package/base-files/default/etc/init.d/S40network
+++ b/package/base-files/default/etc/init.d/S40network
@@ -4,6 +4,6 @@
setup_switch() { return 0; }
. /etc/functions.sh
-include network
+include /lib/network
setup_switch
/sbin/wifi
diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown
index 1334ee8218..073e80d2da 100755
--- a/package/base-files/default/sbin/ifdown
+++ b/package/base-files/default/sbin/ifdown
@@ -3,7 +3,7 @@
[ $# = 0 ] && { echo " $0 <group>"; exit; }
. /etc/functions.sh
-include network
+include /lib/network
scan_interfaces
cfg=$1
diff --git a/package/base-files/default/sbin/wifi b/package/base-files/default/sbin/wifi
index b228eed8a0..4a3ec8cfef 100755
--- a/package/base-files/default/sbin/wifi
+++ b/package/base-files/default/sbin/wifi
@@ -30,7 +30,7 @@ config_cb() {
}
config_load wireless
-include wifi
+include /lib/wifi
for device in $DEVICES; do (
config_get iftype "$device" type
diff --git a/package/base-files/default/usr/share/udhcpc/default.script b/package/base-files/default/usr/share/udhcpc/default.script
index a244e05a15..e048687f74 100755
--- a/package/base-files/default/usr/share/udhcpc/default.script
+++ b/package/base-files/default/usr/share/udhcpc/default.script
@@ -1,7 +1,7 @@
#!/bin/sh
[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
. /etc/functions.sh
-include network
+include /lib/network
RESOLV_CONF="/tmp/resolv.conf"