From fa955f66bc5f70b61eb0864d0340966e2a554435 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 14 Mar 2023 12:16:33 +0100
Subject: [PATCH] network time: migrate to PID file

---
 src/etc/inc/plugins.inc.d/ntpd.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/ntpd.inc b/src/etc/inc/plugins.inc.d/ntpd.inc
index 105d299e9..323c66103 100644
--- a/src/etc/inc/plugins.inc.d/ntpd.inc
+++ b/src/etc/inc/plugins.inc.d/ntpd.inc
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2016-2022 Franco Fichtner <franco@opnsense.org>
+ * Copyright (C) 2016-2023 Franco Fichtner <franco@opnsense.org>
  * Copyright (C) 2004-2007 Scott Ullrich <sullrich@gmail.com>
  * Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
  * All rights reserved.
@@ -50,6 +50,7 @@ function ntpd_services()
     $pconfig['description'] = gettext('Network Time Daemon');
     $pconfig['php']['restart'] = array('ntpd_configure_do');
     $pconfig['php']['start'] = array('ntpd_configure_do');
+    $pconfig['pidfile'] = '/var/run/ntpd.pid';
 
     if (!empty($config['ntpd']['clientmode'])) {
         $pconfig['nocheck'] = true;
@@ -171,7 +172,7 @@ function ntpd_configure_do($verbose = false)
 {
     global $config;
 
-    killbyname('ntpd', 'TERM', true);
+    killbypid('/var/run/ntpd.pid');
 
     if (!ntpd_enabled()) {
         return;
@@ -451,7 +452,7 @@ function ntpd_configure_do($verbose = false)
     @mkdir('/var/empty', 0775, true);
 
     if (empty($config['ntpd']['clientmode'])) {
-        mwexecf('/usr/local/sbin/ntpd -g -c %s', ['/var/etc/ntpd.conf']);
+        mwexecf('/usr/local/sbin/ntpd -g -p %s -c %s', ['/var/run/ntpd.pid', '/var/etc/ntpd.conf']);
     } else {
         mwexecf_bg('/usr/local/sbin/ntpd -q -g -c %s', ['/var/etc/ntpd.conf']);
     }