From aa44be4505a2a98c53833914dc95a470a0505b20 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 5 Jun 2012 16:04:23 +0000 Subject: [package] /etc/functions.sh => /lib/functions.sh git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32062 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/boot | 2 +- package/base-files/files/etc/init.d/rcS | 2 +- package/base-files/files/etc/preinit | 2 +- package/base-files/files/lib/upgrade/common.sh | 2 +- package/base-files/files/sbin/hotplug-call | 2 +- package/base-files/files/sbin/led.sh | 2 +- package/base-files/files/sbin/sysupgrade | 4 ++-- package/base-files/files/sbin/wifi | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'package/base-files') diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 250bfe040..43837a80f 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 3b8043209..3ec9bfef6 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 6c6e3b1fe..0fdfa8cf8 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 a705d972d..0a92aadcf 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() { # [...] 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 0d96e80aa..d627becc6 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 44629d990..d67a0f51c 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 be11c5bf3..3868dc456 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 5cbf50b5f..8528efeed 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 <