Package: xymon
Version: 4.3.30-1
Severity: normal
Tags: patch

Dear maintainers,

ntpdate emits a warning when called with the -p option. I've attached a
patch to drop that option from xymonserver.cfg.

If you prefer, I can also commit directly to salsa.

Regards

Carsten

>From 6df3ff8215dd4c3d848f9ec22de3f94d84767a95 Mon Sep 17 00:00:00 2001
From: Carsten Leonhardt <l...@debian.org>
Date: Tue, 28 Nov 2023 16:15:16 +0100
Subject: [PATCH] xymon: update xymonserver.cfg: ntpdate no longer supports the
 "-p" option (cf. #926877).

---
 debian/changelog                     | 2 ++
 xymond/etcfiles/xymonserver.cfg.DIST | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b83b5d6..c440bc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ xymon (4.3.30-2) UNRELEASED; urgency=medium
   [ Carsten Leonhardt ]
   * Update xymon-client.init: add "reload" to usage message as that is
     supported, too.
+  * xymon: update xymonserver.cfg: ntpdate no longer supports the "-p"
+    option.
 
  -- Axel Beckert <a...@debian.org>  Mon, 10 Aug 2020 04:39:28 +0200
 
diff --git a/xymond/etcfiles/xymonserver.cfg.DIST b/xymond/etcfiles/xymonserver.cfg.DIST
index 53ff592..3a9229b 100644
--- a/xymond/etcfiles/xymonserver.cfg.DIST
+++ b/xymond/etcfiles/xymonserver.cfg.DIST
@@ -134,7 +134,7 @@ NONETPAGE=""					# Network tests that go YELLOW upon failure
 FPING="@FPING@"					# Path and options for the ping program.
 FPINGOPTS="-Ae"					# Standard options to fping/xymonping
 NTPDATE="ntpdate"				# Path to the 'ntpdate' program
-NTPDATEOPTS="-u -q -p 1"			# Standard options to ntpdate
+NTPDATEOPTS="-u -q"				# Standard options to ntpdate
 TRACEROUTE="traceroute"                         # How to do traceroute on failing ping tests. Requires "trace" in hosts.cfg .
 TRACEROUTEOPTS="-n -q 2 -w 2 -m 15"		# Standard options to traceroute
 XYMONROUTERTEXT="router"			# What to call a failing intermediate network device.
-- 
2.39.2

Reply via email to