From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 19 May 2016 08:24:32 +0000 (+0200)
Subject: Revert "base-files: sysfixtime exclude dnsmasq.time"
X-Git-Tag: v17.01.0-rc1~2757
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=21f460e0c110cbfb97f15648c7a2c4f19c08cfc0;p=openwrt%2Fstaging%2Fxback.git

Revert "base-files: sysfixtime exclude dnsmasq.time"

This reverts commit 382779e009af7c1c688fbd98adf71fb19ce66254.

Reverting this commit due to a missing Signed-off-by.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/base-files/files/etc/init.d/sysfixtime b/package/base-files/files/etc/init.d/sysfixtime
index 1354a586ce..ab946f6518 100755
--- a/package/base-files/files/etc/init.d/sysfixtime
+++ b/package/base-files/files/etc/init.d/sysfixtime
@@ -10,8 +10,8 @@ HWCLOCK=/sbin/hwclock
 boot() {
 	start && exit 0
 
-	local maxtime="$(maxtime)"
 	local curtime="$(date +%s)"
+	local maxtime="$(find /etc -type f -exec date -r {} +%s \; | sort -nr | head -n1)"
 	[ $curtime -lt $maxtime ] && date -s @$maxtime
 }
 
@@ -23,12 +23,3 @@ stop() {
 	[ -e "$RTC_DEV" ] && [ -e "$HWCLOCK" ] && $HWCLOCK -w -f $RTC_DEV && \
 		logger -t sysfixtime "saved '$(date)' to $RTC_DEV"
 }
-
-maxtime() {
-	local file newest
-
-	for file in $( find /etc -type f ! -path /etc/dnsmasq.time ) ; do
-		[ -z "$newest" -o "$newest" -ot "$file"] && newest=$file
-	done
-	[ "$newest" ] && date -r "$newest" +%s
-}