summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-12-20 15:01:04 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-12-20 15:01:04 +0000
commit8cfa5cc7c59e124a7abcf64952ad6c5050121778 (patch)
treea44e7bf81bec4b24b3a364282c2a920071a9dcb5
parentbf25765406456a42ea7d619466e914277cbe479b (diff)
don't use symlink to /lib/functions.sh
Signed-off-by: Luka Perkov <luka@openwrt.org>
-rwxr-xr-xapplications/luci-pbx/root/etc/init.d/pbx-asterisk2
-rwxr-xr-xlibs/core/root/sbin/luci-reload2
-rw-r--r--modules/admin-full/luasrc/controller/admin/system.lua2
-rw-r--r--modules/admin-mini/luasrc/controller/mini/system.lua2
-rw-r--r--modules/failsafe/luasrc/controller/failsafe/failsafe.lua2
-rw-r--r--modules/niu/luasrc/controller/niu/system.lua4
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 <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 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