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

SVN-Revision: 32062

8 files changed, 9 insertions, 9 deletions

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