mirror of
https://github.com/openwrt/packages.git
synced 2026-02-04 12:06:29 +08:00
7d752193e4
As muninlite doesn't appear to have had a release in a few years and activity on the git repo appears to have stalled, we add some patches on our end for now. Patches: - 001->004 are upstream fixes from master. - 100 is a submitted PR: https://github.com/munin-monitoring/muninlite/pull/19 to fix https://github.com/munin-monitoring/muninlite/issues/14. - 200->204 is a submitted PR to allow customizing the monitored network interfaces: https://github.com/munin-monitoring/muninlite/pull/18. Despite the large number of patches it is actually a trivial change. Signed-off-by: Rany Hany <rany_hany@riseup.net>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From a2f1745477e480f91bb68102308217eb95a063c7 Mon Sep 17 00:00:00 2001
|
|
From: Lars Kruse <devel@sumpfralle.de>
|
|
Date: Wed, 4 May 2022 14:52:44 +0200
|
|
Subject: [PATCH 2/5] plugin ntpdate: tolerate multiple NTP servers (e.g. in a
|
|
pool)
|
|
|
|
Previously multiple "server" lines were consumed, but the output of the
|
|
awk filter lacked the line ending. Thus the last numeric value of the
|
|
previous "server" line was concatenated with the first numeric value of
|
|
the following "server" line. Thus multiple dots occurred in a single
|
|
numeric value and parsing just failed.
|
|
|
|
Thanks, glyndon!
|
|
|
|
Closes: #16
|
|
---
|
|
plugins/ntpdate | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/plugins/ntpdate
|
|
+++ b/plugins/ntpdate
|
|
@@ -11,7 +11,7 @@ fetch_ntpdate() {
|
|
OFFSET=0
|
|
DELAY=0
|
|
if [ -n "$NTP_PEER" ] && [ -x "$NTPDATE" ]; then
|
|
- DATA=$("$NTPDATE" -q "$NTP_PEER" | awk '/^server.*offset/{gsub(/,/,""); printf "%s %s", ($6*1000), ($8*1000);}')
|
|
+ DATA=$("$NTPDATE" -q "$NTP_PEER" | awk '/^server.*offset/{gsub(/,/,""); printf "%s %s", ($6*1000), ($8*1000); exit;}')
|
|
OFFSET=$(echo "$DATA" | cut -d " " -f 1)
|
|
DELAY=$(echo "$DATA" | cut -d " " -f 2)
|
|
fi
|