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

SVN-Revision: 32062

package/6in4/files/6in4.hotplug

 #!/bin/sh
 
 if [ "$ACTION" = ifup ]; then
-	. /etc/functions.sh
+	. /lib/functions.sh
 
 	INCLUDE_ONLY=1
 	. /lib/netifd/proto/6in4.sh

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

package/6to4/files/6to4.hotplug

 #!/bin/sh
 
 if [ "$ACTION" = ifup ]; then
-	. /etc/functions.sh
+	. /lib/functions.sh
 
 	INCLUDE_ONLY=1
 	. /lib/netifd/proto/6to4.sh

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

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() {

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

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

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

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

package/base-files/files/sbin/led.sh

 #!/bin/sh
 # (C) 2008 openwrt.org
 
-. /etc/functions.sh
+. /lib/functions.sh
 ACTION=$1
 NAME=$2
 do_led() {

package/base-files/files/sbin/sysupgrade

 #!/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

package/base-files/files/sbin/wifi

 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
-. /etc/functions.sh
+. /lib/functions.sh
 
 usage() {
 	cat <<EOF

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() { 

package/comgt/files/3g.usb

 #!/bin/sh
-. /etc/functions.sh
+. /lib/functions.sh
 . /lib/netifd/netifd-proto.sh
 
 find_3g_iface() {

package/firewall/files/bin/fw

 #!/bin/sh
 FW_LIBDIR=/lib/firewall
 
-. /etc/functions.sh
+. /lib/functions.sh
 . ${FW_LIBDIR}/fw.sh
 
 case "$(type fw)" in

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

package/iproute2/files/30-teql

 #!/bin/sh
 
-. /etc/functions.sh
+. /lib/functions.sh
 
 if [ "$ACTION" != "ifup" ]; then
 	exit

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

package/netifd/files/lib/netifd/dhcp.script

 #!/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() {

package/netifd/files/lib/netifd/proto/dhcp.sh

 #!/bin/sh
 
-. /etc/functions.sh
+. /lib/functions.sh
 . ../netifd-proto.sh
 init_proto "$@"