From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 24 Sep 2006 13:32:18 +0000 (+0000)
Subject: use absolute paths in include() shell function
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/139dfb16c8d408dce549701a7b3e57f5f06d5257

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
---

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 27b0a6d5f..ce22ed151 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 b5140758a..0a24b052f 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 ec290335d..f2c3e2285 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 1334ee821..073e80d2d 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 b228eed8a..4a3ec8cfe 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 a244e05a1..e048687f7 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"