don't use symlink to /lib/functions.sh

Signed-off-by: Luka Perkov <luka@openwrt.org>

diff --git a/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/applications/luci-pbx/root/etc/init.d/pbx-asterisk
index 0c41833cfc91510a35470650f9dbf2da697b203d..99663a971a43f2fee72210dfa85fe80575c33d93 100755 (executable)
--- a/applications/luci-pbx/root/etc/init.d/pbx-asterisk
+++ b/applications/luci-pbx/root/etc/init.d/pbx-asterisk
@@ -17,7 +17,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
 
-. /etc/functions.sh
+. /lib/functions.sh
 
 START=60
 

diff --git a/libs/core/root/sbin/luci-reload b/libs/core/root/sbin/luci-reload
index 4bcac045b30a6b8aa11af3de08d68bb1154fb657..cc41da2bb7fde75ba2bfcd1c0b0ab10a2a4f9eda 100755 (executable)
--- a/libs/core/root/sbin/luci-reload
+++ b/libs/core/root/sbin/luci-reload
@@ -1,5 +1,5 @@
 #!/bin/sh
-. /etc/functions.sh
+. /lib/functions.sh
 
 apply_config() {
        config_get init "$1" init

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 1087cf8db67a7c5c006bb2a598aa4f3f1eddd961..55ad01ca482e56528b612b6fa3218576cfb5e55c 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -189,7 +189,7 @@ function action_flashops()
        local function image_supported()
                -- XXX: yay...
                return ( 0 == os.execute(
-                       ". /etc/functions.sh; " ..
+                       ". /lib/functions.sh; " ..
                        "include /lib/upgrade; " ..
                        "platform_check_image %q >/dev/null"
                                % image_tmp

diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 519c15bc63e6c7db922ca2e862134b85d659ff9e..71b5b63519b19a8bc4c4fdfa38882a7d8611f7e3 100644 (file)
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -81,7 +81,7 @@ function action_upgrade()
        local function image_supported()
                -- XXX: yay...
                return ( 0 == os.execute(
-                       ". /etc/functions.sh; " ..
+                       ". /lib/functions.sh; " ..
                        "include /lib/upgrade; " ..
                        "platform_check_image %q >/dev/null"
                                % tmpfile

diff --git a/modules/failsafe/luasrc/controller/failsafe/failsafe.lua b/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
index c37fef597c9c8fb2a873e011521d2e1b254d0aab..1da3438f8fd93444afa47cf27fada4279a07edaa 100644 (file)
--- a/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
+++ b/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
@@ -53,7 +53,7 @@ function action_flashops()
        local function image_supported()
                -- XXX: yay...
                return ( 0 == os.execute(
-                       ". /etc/functions.sh; " ..
+                       ". /lib/functions.sh; " ..
                        "include /lib/upgrade; " ..
                        "platform_check_image %q >/dev/null"
                                % image_tmp

diff --git a/modules/niu/luasrc/controller/niu/system.lua b/modules/niu/luasrc/controller/niu/system.lua
index 593a4488397a87fc76e1e50319357027077cf752..127a311c57750024ba70bc860eb6ee7ec4aeb3f0 100644 (file)
--- a/modules/niu/luasrc/controller/niu/system.lua
+++ b/modules/niu/luasrc/controller/niu/system.lua
@@ -127,7 +127,7 @@ function upgrade()
        local function image_supported()
                -- XXX: yay...
                return ( 0 == os.execute(
-                       ". /etc/functions.sh; " ..
+                       ". /lib/functions.sh; " ..
                        "include /lib/upgrade; " ..
                        "platform_check_image %q >/dev/null"
                                % tmpfile
@@ -262,4 +262,4 @@ function upgrade()
                        keepconfig=(keep_avail and http.formvalue("keepcfg") == "1")
                } )
        end     
-end
\ No newline at end of file
+end