diff options
Diffstat (limited to 'package')
25 files changed, 26 insertions, 26 deletions
diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug index 8d78555477..e94179828b 100644 --- a/package/6in4/files/6in4.hotplug +++ b/package/6in4/files/6in4.hotplug @@ -1,7 +1,7 @@ #!/bin/sh if [ "$ACTION" = ifup ]; then - . /etc/functions.sh + . /lib/functions.sh INCLUDE_ONLY=1 . /lib/netifd/proto/6in4.sh diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh index 6e433ba9ad..dd438601fa 100755 --- a/package/6in4/files/6in4.sh +++ b/package/6in4/files/6in4.sh @@ -3,7 +3,7 @@ # Copyright (c) 2010 OpenWrt.org [ -n "$INCLUDE_ONLY" ] || { - . /etc/functions.sh + . /lib/functions.sh . ../netifd-proto.sh init_proto "$@" } diff --git a/package/6to4/files/6to4.hotplug b/package/6to4/files/6to4.hotplug index 202a3c737c..48ac9c1b81 100644 --- a/package/6to4/files/6to4.hotplug +++ b/package/6to4/files/6to4.hotplug @@ -1,7 +1,7 @@ #!/bin/sh if [ "$ACTION" = ifup ]; then - . /etc/functions.sh + . /lib/functions.sh INCLUDE_ONLY=1 . /lib/netifd/proto/6to4.sh diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh index c9f97bd778..c2e911a6ef 100755 --- a/package/6to4/files/6to4.sh +++ b/package/6to4/files/6to4.sh @@ -3,7 +3,7 @@ # Copyright (c) 2010-2012 OpenWrt.org [ -n "$INCLUDE_ONLY" ] || { - . /etc/functions.sh + . /lib/functions.sh . ../netifd-proto.sh init_proto "$@" } diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 250bfe0401..43837a80f2 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -48,7 +48,7 @@ system_config() { } apply_uci_config() { - sh -c '. /etc/functions.sh; include /lib/config; uci_apply_defaults' + sh -c '. /lib/functions.sh; include /lib/config; uci_apply_defaults' } start() { diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS index 3b80432096..3ec9bfef6e 100755 --- a/package/base-files/files/etc/init.d/rcS +++ b/package/base-files/files/etc/init.d/rcS @@ -14,7 +14,7 @@ system_config() { LOGGER="cat" [ -x /usr/bin/logger ] && LOGGER="logger -s -p 6 -t sysinit" -. /etc/functions.sh +. /lib/functions.sh config_load system config_foreach system_config system diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index 6c6e3b1fe1..0fdfa8cf88 100755 --- a/package/base-files/files/etc/preinit +++ b/package/base-files/files/etc/preinit @@ -21,7 +21,7 @@ pi_init_suppress_stderr="y" pi_init_path="/bin:/sbin:/usr/bin:/usr/sbin" pi_init_cmd="/sbin/init" -. /etc/functions.sh +. /lib/functions.sh . /lib/functions/boot.sh boot_hook_init preinit_essential diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index a705d972d9..0a92aadcfb 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -58,7 +58,7 @@ run_ramfs() { # <command> [...] for file in $RAMFS_COPY_BIN; do install_bin $file done - install_file /etc/resolv.conf /etc/functions.sh /lib/functions.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA + install_file /etc/resolv.conf /lib/functions.sh /lib/functions.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA pivot $RAM_ROOT /mnt || { echo "Failed to switch over to ramfs. Please reboot." diff --git a/package/base-files/files/sbin/hotplug-call b/package/base-files/files/sbin/hotplug-call index 0d96e80aaf..d627becc69 100755 --- a/package/base-files/files/sbin/hotplug-call +++ b/package/base-files/files/sbin/hotplug-call @@ -3,7 +3,7 @@ export HOTPLUG_TYPE="$1" -. /etc/functions.sh +. /lib/functions.sh PATH=/bin:/sbin:/usr/bin:/usr/sbin LOGNAME=root diff --git a/package/base-files/files/sbin/led.sh b/package/base-files/files/sbin/led.sh index 44629d9903..d67a0f51cc 100755 --- a/package/base-files/files/sbin/led.sh +++ b/package/base-files/files/sbin/led.sh @@ -1,7 +1,7 @@ #!/bin/sh # (C) 2008 openwrt.org -. /etc/functions.sh +. /lib/functions.sh ACTION=$1 NAME=$2 do_led() { diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index be11c5bf3f..3868dc456e 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -1,5 +1,5 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh # initialize defaults RAMFS_COPY_BIN="" # extra programs for temporary ramfs root @@ -169,7 +169,7 @@ kill_remaining KILL if [ -n "$(rootfs_type)" ]; then v "Switching to ramdisk..." - run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade' + run_ramfs '. /lib/functions.sh; include /lib/upgrade; do_upgrade' else do_upgrade fi diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi index 5cbf50b5f5..8528efeed6 100755 --- a/package/base-files/files/sbin/wifi +++ b/package/base-files/files/sbin/wifi @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2006 OpenWrt.org -. /etc/functions.sh +. /lib/functions.sh usage() { cat <<EOF diff --git a/package/block-mount/files/block.sh b/package/block-mount/files/block.sh index ac8ca3bfb1..2b679a8e83 100644 --- a/package/block-mount/files/block.sh +++ b/package/block-mount/files/block.sh @@ -4,7 +4,7 @@ # See /LICENSE for more information. # -. /etc/functions.sh +. /lib/functions.sh reset_block_cb() { mount_cb() { diff --git a/package/comgt/files/3g.usb b/package/comgt/files/3g.usb index d3859c257c..1dabc0c98f 100644 --- a/package/comgt/files/3g.usb +++ b/package/comgt/files/3g.usb @@ -1,5 +1,5 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh . /lib/netifd/netifd-proto.sh find_3g_iface() { diff --git a/package/firewall/files/bin/fw b/package/firewall/files/bin/fw index 0f83b8eed8..5d20cc83ef 100644 --- a/package/firewall/files/bin/fw +++ b/package/firewall/files/bin/fw @@ -1,7 +1,7 @@ #!/bin/sh FW_LIBDIR=/lib/firewall -. /etc/functions.sh +. /lib/functions.sh . ${FW_LIBDIR}/fw.sh case "$(type fw)" in diff --git a/package/firewall/files/firewall.hotplug b/package/firewall/files/firewall.hotplug index 720b34cc89..52e7798485 100644 --- a/package/firewall/files/firewall.hotplug +++ b/package/firewall/files/firewall.hotplug @@ -6,7 +6,7 @@ [ "$DEVICE" == "lo" ] && exit 0 -. /etc/functions.sh +. /lib/functions.sh . /lib/firewall/core.sh fw_init diff --git a/package/iproute2/files/30-teql b/package/iproute2/files/30-teql index 231c09fa7b..a0c0e503aa 100644 --- a/package/iproute2/files/30-teql +++ b/package/iproute2/files/30-teql @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh if [ "$ACTION" != "ifup" ]; then exit diff --git a/package/ltq-dsl-app/files/dsl_notify.sh b/package/ltq-dsl-app/files/dsl_notify.sh index f440450f0f..5e9f3964e8 100644 --- a/package/ltq-dsl-app/files/dsl_notify.sh +++ b/package/ltq-dsl-app/files/dsl_notify.sh @@ -9,7 +9,7 @@ [ "$DSL_NOTIFICATION_TYPE" = "DSL_INTERFACE_STATUS" ] || exit 0 -. /etc/functions.sh +. /lib/functions.sh include /lib/network scan_interfaces diff --git a/package/netifd/files/lib/netifd/dhcp.script b/package/netifd/files/lib/netifd/dhcp.script index d13ce7ec74..0097a96f88 100755 --- a/package/netifd/files/lib/netifd/dhcp.script +++ b/package/netifd/files/lib/netifd/dhcp.script @@ -1,7 +1,7 @@ #!/bin/sh [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1 -. /etc/functions.sh +. /lib/functions.sh . /lib/netifd/netifd-proto.sh set_classless_routes() { diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/netifd/files/lib/netifd/proto/dhcp.sh index 4bdb3a7d06..1080dbf5ed 100755 --- a/package/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/netifd/files/lib/netifd/proto/dhcp.sh @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh . ../netifd-proto.sh init_proto "$@" diff --git a/package/netifd/files/sbin/ifup b/package/netifd/files/sbin/ifup index e17b67de5c..0d2a3ca107 100755 --- a/package/netifd/files/sbin/ifup +++ b/package/netifd/files/sbin/ifup @@ -51,7 +51,7 @@ else fi if [ -n "$setup_wifi" ] && grep -q config /etc/config/wireless; then - . /etc/functions.sh + . /lib/functions.sh find_related_radios() { local wdev wnet diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index c516691329..297a329154 100755 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -3,7 +3,7 @@ [ -x /usr/sbin/pppd ] || exit 0 [ -n "$INCLUDE_ONLY" ] || { - . /etc/functions.sh + . /lib/functions.sh . ../netifd-proto.sh init_proto "$@" } diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh index 911e0aae2a..e2e4729b92 100755 --- a/package/pptp/files/pptp.sh +++ b/package/pptp/files/pptp.sh @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh . ../netifd-proto.sh init_proto "$@" diff --git a/package/qos-scripts/files/usr/bin/qos-stat b/package/qos-scripts/files/usr/bin/qos-stat index 8a39df0847..78d163888b 100755 --- a/package/qos-scripts/files/usr/bin/qos-stat +++ b/package/qos-scripts/files/usr/bin/qos-stat @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2011 OpenWrt.org -. /etc/functions.sh +. /lib/functions.sh include /lib/network diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh index bb1d7ed111..440b43f5d1 100755 --- a/package/qos-scripts/files/usr/lib/qos/generate.sh +++ b/package/qos-scripts/files/usr/lib/qos/generate.sh @@ -1,5 +1,5 @@ #!/bin/sh -[ -e /etc/functions.sh ] && . /etc/functions.sh || . ./functions.sh +[ -e /lib/functions.sh ] && . /lib/functions.sh || . ./functions.sh [ -x /sbin/modprobe ] && { insmod="modprobe" rmmod="$insmod -r" |