projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
643cdb2
)
use absolute paths in include() shell function
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 24 Sep 2006 13:32:18 +0000
(13:32 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 24 Sep 2006 13:32:18 +0000
(13:32 +0000)
SVN-Revision: 4852
openwrt/package/base-files/default/etc/functions.sh
patch
|
blob
|
history
openwrt/package/base-files/default/etc/hotplug.d/net/10-net
patch
|
blob
|
history
openwrt/package/base-files/default/etc/init.d/S40network
patch
|
blob
|
history
openwrt/package/base-files/default/sbin/ifdown
patch
|
blob
|
history
openwrt/package/base-files/default/sbin/wifi
patch
|
blob
|
history
openwrt/package/base-files/default/usr/share/udhcpc/default.script
patch
|
blob
|
history
diff --git
a/openwrt/package/base-files/default/etc/functions.sh
b/openwrt/package/base-files/default/etc/functions.sh
index 27b0a6d5fc90a27c2608456392d619bd89126c46..ce22ed151c3e25dd2eaf9aa6ac6c25e7f87e1e00 100755
(executable)
--- a/
openwrt/package/base-files/default/etc/functions.sh
+++ b/
openwrt/package/base-files/default/etc/functions.sh
@@
-93,7
+93,7
@@
load_modules() {
}
include() {
}
include() {
- for file in $(ls
/lib/
$1/*.sh 2>/dev/null); do
+ for file in $(ls $1/*.sh 2>/dev/null); do
. $file
done
}
. $file
done
}
diff --git
a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
index b5140758afe312cd273ee0289c69128835de8022..0a24b052f3c2f0c94cf19f2ce37623dc4eddec02 100644
(file)
--- a/
openwrt/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/
openwrt/package/base-files/default/etc/hotplug.d/net/10-net
@@
-1,6
+1,6
@@
# Copyright (C) 2006 OpenWrt.org
# Copyright (C) 2006 OpenWrt.org
-include network
+include
/lib/
network
addif() {
scan_interfaces
addif() {
scan_interfaces
diff --git
a/openwrt/package/base-files/default/etc/init.d/S40network
b/openwrt/package/base-files/default/etc/init.d/S40network
index ec290335db772afc0a6cea337b068a3404037f1f..f2c3e22859b1b23238d599b2ec3f750eca67a680 100755
(executable)
--- a/
openwrt/package/base-files/default/etc/init.d/S40network
+++ b/
openwrt/package/base-files/default/etc/init.d/S40network
@@
-4,6
+4,6
@@
setup_switch() { return 0; }
. /etc/functions.sh
setup_switch() { return 0; }
. /etc/functions.sh
-include network
+include
/lib/
network
setup_switch
/sbin/wifi
setup_switch
/sbin/wifi
diff --git
a/openwrt/package/base-files/default/sbin/ifdown
b/openwrt/package/base-files/default/sbin/ifdown
index 1334ee8218310b16f487756801c6f314b247e99d..073e80d2dad996581da3b612ae3a66363b57d474 100755
(executable)
--- a/
openwrt/package/base-files/default/sbin/ifdown
+++ b/
openwrt/package/base-files/default/sbin/ifdown
@@
-3,7
+3,7
@@
[ $# = 0 ] && { echo " $0 <group>"; exit; }
. /etc/functions.sh
[ $# = 0 ] && { echo " $0 <group>"; exit; }
. /etc/functions.sh
-include network
+include
/lib/
network
scan_interfaces
cfg=$1
scan_interfaces
cfg=$1
diff --git
a/openwrt/package/base-files/default/sbin/wifi
b/openwrt/package/base-files/default/sbin/wifi
index b228eed8a05d0f03b33f2d038dbfe73c1f3b611a..4a3ec8cfef259c7e620cf78d83210a102ee07fd5 100755
(executable)
--- a/
openwrt/package/base-files/default/sbin/wifi
+++ b/
openwrt/package/base-files/default/sbin/wifi
@@
-30,7
+30,7
@@
config_cb() {
}
config_load wireless
}
config_load wireless
-include wifi
+include
/lib/
wifi
for device in $DEVICES; do (
config_get iftype "$device" type
for device in $DEVICES; do (
config_get iftype "$device" type
diff --git
a/openwrt/package/base-files/default/usr/share/udhcpc/default.script
b/openwrt/package/base-files/default/usr/share/udhcpc/default.script
index a244e05a157da9a45e6abbc89f4ee5f3d8e47fc6..e048687f7469cae01bf12fd0efaf1d6330c851a5 100755
(executable)
--- a/
openwrt/package/base-files/default/usr/share/udhcpc/default.script
+++ b/
openwrt/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
#!/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"
RESOLV_CONF="/tmp/resolv.conf"