* luci/libs: move time fix to luci-addons

diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index 3428eb0..27d214d 100644 (file)
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -26,12 +26,14 @@ define Package/luci-addons/install
        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_DIR) $(1)/etc/crontabs
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_DIR) $(1)/etc/init.d
 
        $(INSTALL_BIN) ./dist/usr/bin/run-parts $(1)/usr/bin
        $(INSTALL_BIN) ./dist/sbin/luci-flash $(1)/sbin
+       $(INSTALL_BIN) ./dist/etc/init.d/luci-fixtime $(1)/etc/init.d
        
        $(CP) ./dist/etc/crontabs/root $(1)/etc/crontabs/root
        $(CP) ./dist/etc/hotplug.d/iface/20-aliases $(1)/etc/hotplug.d/iface/20-aliases
 endef
 
-$(eval $(call BuildPackage,luci-addons))
\ No newline at end of file
+$(eval $(call BuildPackage,luci-addons))

diff --git a/contrib/package/luci-addons/dist/etc/init.d/luci-fixtime b/contrib/package/luci-addons/dist/etc/init.d/luci-fixtime
new file mode 100644 (file)
index 0000000..6a49594
--- /dev/null
+++ b/contrib/package/luci-addons/dist/etc/init.d/luci-fixtime
@@ -0,0 +1,10 @@
+#!/bin/sh /etc/rc.common
+START=5
+
+start() {
+       cat <<' EOF' | lua -l luci.fs -l luci.sys -
+               if (os.time() < 1000000000) then
+                       os.execute('date -s ' .. os.date('%m%d%H%M%Y', luci.fs.mtime(luci.sys.libpath())))
+               end
+       EOF
+}

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 8516c6f..e3ebe5b 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -29,11 +29,6 @@ require("luci.http")
 require("luci.sys")
 require("luci.fs")
 
--- Dirty OpenWRT fix
-if (os.time() < 1000000000) then
-       os.execute('date -s '..os.date('%m%d%H%M%Y', luci.fs.mtime(luci.sys.libpath() .. "/dispatcher.lua"))..' > /dev/null 2>&1')
-end
-
 context = luci.util.threadlocal()
 
 -- Index table