aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-05-19 10:24:32 +0200
committerJo-Philipp Wich <jo@mein.io>2016-05-19 10:28:11 +0200
commit21f460e0c110cbfb97f15648c7a2c4f19c08cfc0 (patch)
tree14b989176c49c4ad6c6458833bed7f38aa948464
parent9fd8e55132ecfea717062c4f9ee91c79dbe4a427 (diff)
downloadupstream-21f460e0c110cbfb97f15648c7a2c4f19c08cfc0.tar.gz
upstream-21f460e0c110cbfb97f15648c7a2c4f19c08cfc0.tar.bz2
upstream-21f460e0c110cbfb97f15648c7a2c4f19c08cfc0.zip
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>
-rwxr-xr-xpackage/base-files/files/etc/init.d/sysfixtime11
1 files changed, 1 insertions, 10 deletions
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
-}