From: Steven Barth <steven@midlink.org>
Date: Sat, 17 Jan 2009 13:53:03 +0000 (+0000)
Subject: Merge r4072
X-Git-Tag: 0.8.4~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19b3320a9fe406ee45f4915712302069336350a3;p=oweals%2Fluci.git

Merge r4072
---

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index b4a978f2c..01f7ca322 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -283,6 +283,7 @@ endef
 
 define Package/luci-admin-core/install
 	$(call Package/luci/install/template,$(1),modules/admin-core)
+	touch $(1)/etc/init.d/luci_fixtime || true
 endef
 
 
diff --git a/modules/admin-core/root/etc/init.d/luci_fixtime b/modules/admin-core/root/etc/init.d/luci_fixtime
index 681d9d789..f300e45b9 100755
--- a/modules/admin-core/root/etc/init.d/luci_fixtime
+++ b/modules/admin-core/root/etc/init.d/luci_fixtime
@@ -5,7 +5,7 @@ START=05
 start() {
 	cat <<'	EOF' | lua -l luci.fs -l luci.util -
 		if (os.time() < 1000000000) then
-        		os.execute('date -s ' .. os.date('%m%d%H%M%Y', luci.fs.mtime(luci.util.libpath())))
+			os.execute('date -s ' .. os.date('%m%d%H%M%Y', luci.fs.mtime("/etc/init.d/luci_fixtime")))
 		end
 	EOF
 }