From 8cfa5cc7c59e124a7abcf64952ad6c5050121778 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 20 Dec 2012 15:01:04 +0000 Subject: [PATCH] don't use symlink to /lib/functions.sh Signed-off-by: Luka Perkov --- applications/luci-pbx/root/etc/init.d/pbx-asterisk | 2 +- libs/core/root/sbin/luci-reload | 2 +- modules/admin-full/luasrc/controller/admin/system.lua | 2 +- modules/admin-mini/luasrc/controller/mini/system.lua | 2 +- modules/failsafe/luasrc/controller/failsafe/failsafe.lua | 2 +- modules/niu/luasrc/controller/niu/system.lua | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/applications/luci-pbx/root/etc/init.d/pbx-asterisk index 0c41833cf..99663a971 100755 --- 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 . -. /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 4bcac045b..cc41da2bb 100755 --- 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 1087cf8db..55ad01ca4 100644 --- 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 519c15bc6..71b5b6351 100644 --- 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 c37fef597..1da3438f8 100644 --- 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 593a44883..127a311c5 100644 --- 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 -- 2.25.1