[luci] [PATCH] don't use symlink to /lib/functions.sh

[Luka Perkov]

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

Once this gets merged we can get rid of /etc/functions.sh symlink in
OpenWrt.

 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 0c41833..99663a9 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 4bcac04..cc41da2 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 1087cf8..55ad01c 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 519c15b..71b5b63 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 c37fef5..1da3438 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 593a448..127a311 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