1
0
Fork 0
mirror of git://slackware.nl/current.git synced 2025-01-20 22:26:48 +01:00

Sat Jun 1 19:52:37 UTC 2024

patches/packages/ntp-4.2.8p18-x86_64-2_slack15.0.txz:  Rebuilt.
  This is a bugfix release to fix a possible regression. In some cases ntpd
  gets an error on mixed ipv4/ipv6 networks, so we'll make it possible to
  easily configure ntpd to use ipv4 only or ipv6 only (as well as to change
  any other ntpd options).
  rc.ntp: properly create the PID file on start.
  Add /etc/default/ntp to configure ntpd startup options since some people are
  needing to add -4 to avoid an error.
  Thanks to rkelsen and teoberi.
This commit is contained in:
Patrick J Volkerding 2024-06-01 19:52:37 +00:00 committed by Eric Hameleers
parent dd5b1ba2c4
commit e5301d4448
8 changed files with 89 additions and 33 deletions

View file

@ -11,9 +11,28 @@
<description>Tracking Slackware development in git.</description> <description>Tracking Slackware development in git.</description>
<language>en-us</language> <language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
<pubDate>Sun, 26 May 2024 00:07:39 GMT</pubDate> <pubDate>Sat, 1 Jun 2024 19:52:37 GMT</pubDate>
<lastBuildDate>Sun, 26 May 2024 11:30:35 GMT</lastBuildDate> <lastBuildDate>Sun, 2 Jun 2024 11:30:32 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.17</generator> <generator>maintain_current_git.sh v 1.17</generator>
<item>
<title>Sat, 1 Jun 2024 19:52:37 GMT</title>
<pubDate>Sat, 1 Jun 2024 19:52:37 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20240601195237</link>
<guid isPermaLink="false">20240601195237</guid>
<description>
<![CDATA[<pre>
patches/packages/ntp-4.2.8p18-x86_64-2_slack15.0.txz: Rebuilt.
This is a bugfix release to fix a possible regression. In some cases ntpd
gets an error on mixed ipv4/ipv6 networks, so we'll make it possible to
easily configure ntpd to use ipv4 only or ipv6 only (as well as to change
any other ntpd options).
rc.ntp: properly create the PID file on start.
Add /etc/default/ntp to configure ntpd startup options since some people are
needing to add -4 to avoid an error.
Thanks to rkelsen and teoberi.
</pre>]]>
</description>
</item>
<item> <item>
<title>Sun, 26 May 2024 00:07:39 GMT</title> <title>Sun, 26 May 2024 00:07:39 GMT</title>
<pubDate>Sun, 26 May 2024 00:07:39 GMT</pubDate> <pubDate>Sun, 26 May 2024 00:07:39 GMT</pubDate>

View file

@ -1,3 +1,14 @@
Sat Jun 1 19:52:37 UTC 2024
patches/packages/ntp-4.2.8p18-x86_64-2_slack15.0.txz: Rebuilt.
This is a bugfix release to fix a possible regression. In some cases ntpd
gets an error on mixed ipv4/ipv6 networks, so we'll make it possible to
easily configure ntpd to use ipv4 only or ipv6 only (as well as to change
any other ntpd options).
rc.ntp: properly create the PID file on start.
Add /etc/default/ntp to configure ntpd startup options since some people are
needing to add -4 to avoid an error.
Thanks to rkelsen and teoberi.
+--------------------------+
Sun May 26 00:07:39 UTC 2024 Sun May 26 00:07:39 UTC 2024
patches/packages/ntp-4.2.8p18-x86_64-1_slack15.0.txz: Upgraded. patches/packages/ntp-4.2.8p18-x86_64-1_slack15.0.txz: Upgraded.
This is a bugfix release. This is a bugfix release.

View file

@ -1,20 +1,20 @@
Sun May 26 00:09:58 UTC 2024 Sat Jun 1 19:55:28 UTC 2024
Here is the file list for this directory. If you are using a Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh subdirectories, please have the archive administrator refresh
the mirror. the mirror.
drwxr-xr-x 12 root root 4096 2024-05-26 00:07 . drwxr-xr-x 12 root root 4096 2024-06-01 19:52 .
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
-rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT -rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT
-rw-r--r-- 1 root root 1236684 2024-05-25 23:50 ./CHECKSUMS.md5 -rw-r--r-- 1 root root 1236684 2024-05-26 00:10 ./CHECKSUMS.md5
-rw-r--r-- 1 root root 195 2024-05-25 23:50 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 195 2024-05-26 00:10 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
-rw-r--r-- 1 root root 2120825 2024-05-26 00:07 ./ChangeLog.txt -rw-r--r-- 1 root root 2121400 2024-06-01 19:52 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT
-rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi
@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
-rw-r--r-- 1 root root 1615186 2024-05-25 23:50 ./FILELIST.TXT -rw-r--r-- 1 root root 1615186 2024-05-26 00:09 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
-rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT -rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
@ -832,13 +832,13 @@ drwxr-xr-x 2 root root 4096 2022-12-17 19:52 ./pasture/source/samba
-rw-r--r-- 1 root root 7921 2018-04-29 17:31 ./pasture/source/samba/smb.conf.default -rw-r--r-- 1 root root 7921 2018-04-29 17:31 ./pasture/source/samba/smb.conf.default
-rw-r--r-- 1 root root 7933 2018-01-14 20:41 ./pasture/source/samba/smb.conf.default.orig -rw-r--r-- 1 root root 7933 2018-01-14 20:41 ./pasture/source/samba/smb.conf.default.orig
-rw-r--r-- 1 root root 536 2017-03-23 19:18 ./pasture/source/samba/smb.conf.diff.gz -rw-r--r-- 1 root root 536 2017-03-23 19:18 ./pasture/source/samba/smb.conf.diff.gz
drwxr-xr-x 4 root root 4096 2024-05-25 23:30 ./patches drwxr-xr-x 4 root root 4096 2024-06-01 19:55 ./patches
-rw-r--r-- 1 root root 117619 2024-05-25 23:30 ./patches/CHECKSUMS.md5 -rw-r--r-- 1 root root 117670 2024-06-01 19:55 ./patches/CHECKSUMS.md5
-rw-r--r-- 1 root root 195 2024-05-25 23:30 ./patches/CHECKSUMS.md5.asc -rw-r--r-- 1 root root 195 2024-06-01 19:55 ./patches/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 160103 2024-05-25 23:30 ./patches/FILE_LIST -rw-r--r-- 1 root root 160172 2024-06-01 19:55 ./patches/FILE_LIST
-rw-r--r-- 1 root root 15553444 2024-05-25 23:30 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 15555829 2024-06-01 19:55 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 83168 2024-05-25 23:30 ./patches/PACKAGES.TXT -rw-r--r-- 1 root root 83168 2024-06-01 19:55 ./patches/PACKAGES.TXT
drwxr-xr-x 5 root root 32768 2024-05-25 23:30 ./patches/packages drwxr-xr-x 5 root root 32768 2024-06-01 19:55 ./patches/packages
-rw-r--r-- 1 root root 360 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 360 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txt
-rw-r--r-- 1 root root 2389564 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 2389564 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz
-rw-r--r-- 1 root root 163 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 163 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz.asc
@ -1065,9 +1065,9 @@ drwxr-xr-x 2 root root 4096 2023-12-26 00:24 ./patches/packages/linux-5.1
-rw-r--r-- 1 root root 550 2023-05-25 18:24 ./patches/packages/ntfs-3g-2022.10.3-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 550 2023-05-25 18:24 ./patches/packages/ntfs-3g-2022.10.3-x86_64-1_slack15.0.txt
-rw-r--r-- 1 root root 466552 2023-05-25 18:24 ./patches/packages/ntfs-3g-2022.10.3-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 466552 2023-05-25 18:24 ./patches/packages/ntfs-3g-2022.10.3-x86_64-1_slack15.0.txz
-rw-r--r-- 1 root root 163 2023-05-25 18:24 ./patches/packages/ntfs-3g-2022.10.3-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 163 2023-05-25 18:24 ./patches/packages/ntfs-3g-2022.10.3-x86_64-1_slack15.0.txz.asc
-rw-r--r-- 1 root root 562 2024-05-25 17:21 ./patches/packages/ntp-4.2.8p18-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 562 2024-06-01 18:45 ./patches/packages/ntp-4.2.8p18-x86_64-2_slack15.0.txt
-rw-r--r-- 1 root root 2054248 2024-05-25 17:21 ./patches/packages/ntp-4.2.8p18-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 2055012 2024-06-01 18:45 ./patches/packages/ntp-4.2.8p18-x86_64-2_slack15.0.txz
-rw-r--r-- 1 root root 195 2024-05-25 17:21 ./patches/packages/ntp-4.2.8p18-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 195 2024-06-01 18:45 ./patches/packages/ntp-4.2.8p18-x86_64-2_slack15.0.txz.asc
drwxr-xr-x 2 root root 4096 2023-06-23 18:50 ./patches/packages/old-linux-5.15.117 drwxr-xr-x 2 root root 4096 2023-06-23 18:50 ./patches/packages/old-linux-5.15.117
-rw-r--r-- 1 root root 624 2023-06-22 21:10 ./patches/packages/old-linux-5.15.117/kernel-generic-5.15.117-x86_64-1.txt -rw-r--r-- 1 root root 624 2023-06-22 21:10 ./patches/packages/old-linux-5.15.117/kernel-generic-5.15.117-x86_64-1.txt
-rw-r--r-- 1 root root 8507800 2023-06-22 21:10 ./patches/packages/old-linux-5.15.117/kernel-generic-5.15.117-x86_64-1.txz -rw-r--r-- 1 root root 8507800 2023-06-22 21:10 ./patches/packages/old-linux-5.15.117/kernel-generic-5.15.117-x86_64-1.txz
@ -1244,7 +1244,7 @@ drwxr-xr-x 2 root root 4096 2023-11-21 21:09 ./patches/packages/old-linux
-rw-r--r-- 1 root root 463 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 463 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txt
-rw-r--r-- 1 root root 459652 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 459652 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz
-rw-r--r-- 1 root root 163 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 163 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz.asc
drwxr-xr-x 116 root root 4096 2024-05-25 18:33 ./patches/source drwxr-xr-x 116 root root 4096 2024-06-01 19:30 ./patches/source
drwxr-xr-x 2 root root 4096 2023-09-26 19:22 ./patches/source/Cython drwxr-xr-x 2 root root 4096 2023-09-26 19:22 ./patches/source/Cython
-rw-r--r-- 1 root root 1623580 2023-07-04 19:24 ./patches/source/Cython/Cython-0.29.36.tar.lz -rw-r--r-- 1 root root 1623580 2023-07-04 19:24 ./patches/source/Cython/Cython-0.29.36.tar.lz
-rwxr-xr-x 1 root root 3041 2023-09-26 19:23 ./patches/source/Cython/Cython.SlackBuild -rwxr-xr-x 1 root root 3041 2023-09-26 19:23 ./patches/source/Cython/Cython.SlackBuild
@ -1917,16 +1917,17 @@ drwxr-xr-x 2 root root 4096 2022-10-31 18:18 ./patches/source/ntfs-3g
-rw-r--r-- 1 root root 632910 2022-10-03 09:10 ./patches/source/ntfs-3g/ntfs-3g-2022.10.3.tar.lz -rw-r--r-- 1 root root 632910 2022-10-03 09:10 ./patches/source/ntfs-3g/ntfs-3g-2022.10.3.tar.lz
-rwxr-xr-x 1 root root 5220 2023-05-25 18:23 ./patches/source/ntfs-3g/ntfs-3g.SlackBuild -rwxr-xr-x 1 root root 5220 2023-05-25 18:23 ./patches/source/ntfs-3g/ntfs-3g.SlackBuild
-rw-r--r-- 1 root root 1004 2018-02-27 06:13 ./patches/source/ntfs-3g/slack-desc -rw-r--r-- 1 root root 1004 2018-02-27 06:13 ./patches/source/ntfs-3g/slack-desc
drwxr-xr-x 2 root root 4096 2024-05-25 17:20 ./patches/source/ntp drwxr-xr-x 2 root root 4096 2024-06-01 18:27 ./patches/source/ntp
-rw-r--r-- 1 root root 368 2017-04-21 21:34 ./patches/source/ntp/doinst.sh.gz -rw-r--r-- 1 root root 375 2024-06-01 18:27 ./patches/source/ntp/doinst.sh.gz
-rw-r--r-- 1 root root 379 2024-06-01 18:26 ./patches/source/ntp/ntp
-rw-r--r-- 1 root root 4347475 2024-05-25 07:07 ./patches/source/ntp/ntp-4.2.8p18.tar.lz -rw-r--r-- 1 root root 4347475 2024-05-25 07:07 ./patches/source/ntp/ntp-4.2.8p18.tar.lz
-rwxr-xr-x 1 root root 5853 2023-09-08 19:27 ./patches/source/ntp/ntp.SlackBuild -rwxr-xr-x 1 root root 6113 2024-06-01 18:41 ./patches/source/ntp/ntp.SlackBuild
-rw-r--r-- 1 root root 2580 2023-06-12 19:10 ./patches/source/ntp/ntp.conf -rw-r--r-- 1 root root 2580 2023-06-12 19:06 ./patches/source/ntp/ntp.conf
-rw-r--r-- 1 root root 22 1999-10-07 19:50 ./patches/source/ntp/ntp.keys -rw-r--r-- 1 root root 22 1999-10-07 19:50 ./patches/source/ntp/ntp.keys
-rw-r--r-- 1 root root 148 2023-06-12 19:06 ./patches/source/ntp/ntp.logrotate -rw-r--r-- 1 root root 148 2023-06-12 19:06 ./patches/source/ntp/ntp.logrotate
-rw-r--r-- 1 root root 31 2023-06-02 18:26 ./patches/source/ntp/ntp.url -rw-r--r-- 1 root root 31 2023-06-02 18:26 ./patches/source/ntp/ntp.url
-rw-r--r-- 1 root root 2483 2018-02-15 11:45 ./patches/source/ntp/ntpdate.8.gz -rw-r--r-- 1 root root 2483 2018-02-15 11:45 ./patches/source/ntp/ntpdate.8.gz
-rw-r--r-- 1 root root 805 2021-02-16 19:01 ./patches/source/ntp/rc.ntpd -rw-r--r-- 1 root root 907 2024-06-01 18:32 ./patches/source/ntp/rc.ntpd
-rw-r--r-- 1 root root 1013 2023-06-02 18:24 ./patches/source/ntp/slack-desc -rw-r--r-- 1 root root 1013 2023-06-02 18:24 ./patches/source/ntp/slack-desc
drwxr-xr-x 4 root root 4096 2023-06-23 01:19 ./patches/source/old-linux-5.15.117 drwxr-xr-x 4 root root 4096 2023-06-23 01:19 ./patches/source/old-linux-5.15.117
-rwxr-xr-x 1 root root 8310 2022-10-22 18:02 ./patches/source/old-linux-5.15.117/build-all-kernels.sh -rwxr-xr-x 1 root root 8310 2022-10-22 18:02 ./patches/source/old-linux-5.15.117/build-all-kernels.sh

View file

@ -20,6 +20,7 @@ preserve_perms() {
config ${NEW} config ${NEW}
} }
config etc/default/ntp.new
config etc/logrotate.d/ntp.new config etc/logrotate.d/ntp.new
config etc/ntp.conf.new config etc/ntp.conf.new
config etc/ntp.keys.new config etc/ntp.keys.new

12
patches/source/ntp/ntp Normal file
View file

@ -0,0 +1,12 @@
# Default options for the ntpd daemon:
#
# -g: allow initial time correction to be Big (once only)
# -p /run/ntpd.pid: write ntpd PID to this location
# -u ntp:ntp: run ntpd as user ntp, group ntp
#
# Depending on your network, you might want to add -4 (ipv4 only)
# or -6 (ipv6 only).
#
# For other available options, see "man ntpd".
NTPD_OPTS="-g -p /run/ntpd.pid -u ntp:ntp"

View file

@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ntp PKGNAM=ntp
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1_slack15.0} BUILD=${BUILD:-2_slack15.0}
# Automatically determine the architecture we're building on: # Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -56,6 +56,9 @@ else
SLKCFLAGS="-O2" SLKCFLAGS="-O2"
fi fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion"
TMP=${TMP:-/tmp} TMP=${TMP:-/tmp}
PKG=$TMP/package-ntp PKG=$TMP/package-ntp
@ -105,9 +108,14 @@ mkdir -p $PKG/usr/bin
rmdir $PKG/usr/libexec || exit 1 rmdir $PKG/usr/libexec || exit 1
# Install default conf and keys files: # Install default conf and keys files:
mkdir -p $PKG/etc mkdir -p $PKG/etc/default
cat $CWD/ntp.conf > $PKG/etc/ntp.conf.new cp -a $CWD/ntp $PKG/etc/default/ntp.new
cat $CWD/ntp.keys > $PKG/etc/ntp.keys.new chown root:root $PKG/etc/default/ntp.new
chmod 644 $PKG/etc/default/ntp.new
cp -a $CWD/ntp.conf $PKG/etc/ntp.conf.new
chown root:root $PKG/etc/ntp.conf.new
chmod 644 $PKG/etc/ntp.conf.new
cp -a $CWD/ntp.keys $PKG/etc/ntp.keys.new
chown root:ntp $PKG/etc/ntp.keys.new chown root:ntp $PKG/etc/ntp.keys.new
chmod 640 $PKG/etc/ntp.keys.new chmod 640 $PKG/etc/ntp.keys.new

View file

@ -1,21 +1,25 @@
#!/bin/sh #!/bin/sh
# Start/stop/restart ntpd. # Start/stop/restart ntpd.
# Load options from /etc/default/ntp:
. /etc/default/ntp
# Start ntpd: # Start ntpd:
ntpd_start() { ntpd_start() {
echo -n "Starting NTP daemon: /usr/sbin/ntpd -g -u ntp:ntp" echo -n "Starting NTP daemon: /usr/sbin/ntpd $NTPD_OPTS"
/usr/sbin/ntpd -g -u ntp:ntp /usr/sbin/ntpd $NTPD_OPTS
echo echo
} }
# Stop ntpd: # Stop ntpd:
ntpd_stop() { ntpd_stop() {
echo -n "Stopping NTP daemon..." echo -n "Stopping NTP daemon... "
if [ -r /run/ntpd.pid ]; then if [ -r /run/ntpd.pid ]; then
echo -n "(PID $(cat /run/ntpd.pid))"
kill -HUP $(cat /run/ntpd.pid) kill -HUP $(cat /run/ntpd.pid)
rm -f /run/ntpd.pid rm -f /run/ntpd.pid
else else
killall -HUP -q ntpd killall --ns $$ -HUP -q ntpd
fi fi
echo echo
} }
@ -30,7 +34,7 @@ ntpd_restart() {
# Check if ntpd is running # Check if ntpd is running
ntpd_status() { ntpd_status() {
if [ -e /run/ntpd.pid ]; then if [ -e /run/ntpd.pid ]; then
echo "ntpd is running as pid $(cat /run/ntpd.pid)." echo "ntpd is running as PID $(cat /run/ntpd.pid)."
else else
echo "ntpd is stopped." echo "ntpd is stopped."
exit 1 exit 1