From e34a4e0c7b64aa2cc9ccd1b3f69a16db921daf77 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko@openwrt.org>
Date: Wed, 19 Dec 2012 16:07:50 +0000
Subject: [PATCH] Do not use deprecated path to functions.sh (/etc/functions.sh
-> /lib/functions.sh)
SVN-Revision: 34793
---
target/linux/adm5120/rb1xx/base-files/sbin/wget2nand | 2 +-
.../ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 2 +-
target/linux/ar71xx/base-files/sbin/wget2nand | 2 +-
target/linux/atheros/base-files/etc/hotplug.d/button/00-button | 2 +-
.../base-files/lib/preinit/20_failsafe_set_boot_wait_brcm | 2 +-
.../brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 2 +-
target/linux/generic/base-files/init | 2 +-
.../lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 2 +-
.../ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 2 +-
target/linux/ramips/base-files/etc/uci-defaults/network | 2 +-
target/linux/rb532/base-files/sbin/cf2nand | 2 +-
target/linux/rb532/base-files/sbin/wget2nand | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand b/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand
index 6cd8d6fbd9..f7e0a092ca 100755
--- a/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand
+++ b/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand
@@ -6,7 +6,7 @@
# Licence GPL V2
# Author david.goodenough@linkchoose.co.uk
# Based on cf2nand from RB532 support
-. /etc/functions.sh
+. /lib/functions.sh
[ -d /tmp/wget2nand-rootfs ] && {
echo "/tmp/wget2nand-rootfs already exists"
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index c46d0931a9..0fd6813832 100644
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -11,7 +11,7 @@ ath9k_eeprom_extract() {
local count=$3
local mtd
- . /etc/functions.sh
+ . /lib/functions.sh
mtd=$(find_mtd_chardev $part)
[ -n "$mtd" ] || \
diff --git a/target/linux/ar71xx/base-files/sbin/wget2nand b/target/linux/ar71xx/base-files/sbin/wget2nand
index 56a8ae2244..f80eecd219 100755
--- a/target/linux/ar71xx/base-files/sbin/wget2nand
+++ b/target/linux/ar71xx/base-files/sbin/wget2nand
@@ -6,7 +6,7 @@
# Licence GPL V2
# Author david.goodenough@linkchoose.co.uk
# Based on cf2nand from RB532 support
-. /etc/functions.sh
+. /lib/functions.sh
wget2nand_dir=/tmp/wget2nand
mnt_kernel=$wget2nand_dir/mnt_kernel
diff --git a/target/linux/atheros/base-files/etc/hotplug.d/button/00-button b/target/linux/atheros/base-files/etc/hotplug.d/button/00-button
index 857a59b4a8..63cc217d5d 100644
--- a/target/linux/atheros/base-files/etc/hotplug.d/button/00-button
+++ b/target/linux/atheros/base-files/etc/hotplug.d/button/00-button
@@ -1,4 +1,4 @@
-. /etc/functions.sh
+. /lib/functions.sh
do_button () {
local button
local action
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_set_boot_wait_brcm b/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_set_boot_wait_brcm
index da721b8484..001f5f4d3f 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_set_boot_wait_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_set_boot_wait_brcm
@@ -1,6 +1,6 @@
#!/bin/sh
-. /etc/functions.sh
+. /lib/functions.sh
set_boot_wait() {
[ -x "/usr/sbin/nvram" ] && {
diff --git a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 46be9d3f99..c03ba4c6ec 100644
--- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -12,7 +12,7 @@ rt2x00_eeprom_extract() {
local count=$3
local mtd
- . /etc/functions.sh
+ . /lib/functions.sh
mtd=$(find_mtd_part $part)
[ -n "$mtd" ] || \
diff --git a/target/linux/generic/base-files/init b/target/linux/generic/base-files/init
index 470576156b..b4ef4fe687 100755
--- a/target/linux/generic/base-files/init
+++ b/target/linux/generic/base-files/init
@@ -35,7 +35,7 @@ echo "- init -"
# Load the modules we have in initramfs, this should
# make the media accessible, but, it may take some time
-. /etc/functions.sh
+. /lib/functions.sh
load_modules /etc/modules /etc/modules.d/*
#wait 10 seconds for the disc to show up
diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index e58ca34de4..e3509bdd2b 100644
--- a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -12,7 +12,7 @@ rt2x00_eeprom_extract() {
local count=$3
local mtd
- . /etc/functions.sh
+ . /lib/functions.sh
mtd=$(find_mtd_part $part)
[ -n "$mtd" ] || \
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 32c97fce41..21c9f5f886 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -11,7 +11,7 @@ rt2x00_eeprom_extract() {
local count=$3
local mtd
- . /etc/functions.sh
+ . /lib/functions.sh
mtd=$(find_mtd_part $part)
[ -n "$mtd" ] || \
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 5d49923bb5..dadb95bcb8 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -1,6 +1,6 @@
#!/bin/sh
-. /etc/functions.sh
+. /lib/functions.sh
. /lib/ramips.sh
. /lib/functions/uci-defaults.sh
diff --git a/target/linux/rb532/base-files/sbin/cf2nand b/target/linux/rb532/base-files/sbin/cf2nand
index 60542de1e1..0bfc259ef6 100755
--- a/target/linux/rb532/base-files/sbin/cf2nand
+++ b/target/linux/rb532/base-files/sbin/cf2nand
@@ -1,5 +1,5 @@
#!/bin/sh
-. /etc/functions.sh
+. /lib/functions.sh
copy_kernel() {
local input="$1"
diff --git a/target/linux/rb532/base-files/sbin/wget2nand b/target/linux/rb532/base-files/sbin/wget2nand
index 57f4128642..9a111fa896 100755
--- a/target/linux/rb532/base-files/sbin/wget2nand
+++ b/target/linux/rb532/base-files/sbin/wget2nand
@@ -6,7 +6,7 @@
# Licence GPL V2
# Author david.goodenough@linkchoose.co.uk
# Based on cf2nand from RB532 support
-. /etc/functions.sh
+. /lib/functions.sh
[ -d /tmp/wget2nand ] && {
echo "/tmp/wget2nand already exists"
--
GitLab