/etc/functions.sh => /lib/functions.sh

SVN-Revision: 32062
13 years ago · 9ae901445b
parent 9a61b249c5
commit 9ae901445b
25 changed files with 26 additions and 26 deletions
--- 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
--- 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 "$@"
 }
--- 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
--- 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 "$@"
 }
--- 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() {
--- 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
--- 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
--- 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."
--- 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
--- 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() {
--- 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
--- 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
--- 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() { 
--- 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() {
--- 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
--- 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
--- 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
--- 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
--- 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() {
--- 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 "$@"

--- 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
--- 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 "$@"
 }
--- 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 "$@"

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

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