|
|
From b4f723b7fd4c3a56f8b0e08da5998fa31bac5673 Mon Sep 17 00:00:00 2001
|
|
|
From: Brent Cook <busterb@gmail.com>
|
|
|
Date: Wed, 31 Dec 2014 08:26:41 -0600
|
|
|
Subject: [PATCH 07/12] add -p option to create a pid file
|
|
|
|
|
|
This is used in both the Gentoo and Debian ports.
|
|
|
|
|
|
Origin: https://bugs.gentoo.org/show_bug.cgi?id=493082
|
|
|
---
|
|
|
src/usr.sbin/ntpd/ntpd.8 | 4 ++++
|
|
|
src/usr.sbin/ntpd/ntpd.c | 35 +++++++++++++++++++++++++++++------
|
|
|
src/usr.sbin/ntpd/ntpd.h | 1 +
|
|
|
3 files changed, 34 insertions(+), 6 deletions(-)
|
|
|
|
|
|
diff --git a/src/usr.sbin/ntpd/ntpd.8 b/src/usr.sbin/ntpd/ntpd.8
|
|
|
index dcfb6d2..1b885a1 100644
|
|
|
--- a/src/usr.sbin/ntpd/ntpd.8
|
|
|
+++ b/src/usr.sbin/ntpd/ntpd.8
|
|
|
@@ -25,6 +25,7 @@
|
|
|
.Bk -words
|
|
|
.Op Fl dnSsv
|
|
|
.Op Fl f Ar file
|
|
|
+.Op Fl p Ar file
|
|
|
.Ek
|
|
|
.Sh DESCRIPTION
|
|
|
The
|
|
|
@@ -59,6 +60,9 @@ instead of the default
|
|
|
.It Fl n
|
|
|
Configtest mode.
|
|
|
Only check the configuration file for validity.
|
|
|
+.It Fl p Ar file
|
|
|
+Write pid to
|
|
|
+.Ar file
|
|
|
.It Fl S
|
|
|
Do not set the time immediately at startup.
|
|
|
This is the default.
|
|
|
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
|
|
|
index 0f43b1f..e31db98 100644
|
|
|
--- a/src/usr.sbin/ntpd/ntpd.c
|
|
|
+++ b/src/usr.sbin/ntpd/ntpd.c
|
|
|
@@ -87,6 +87,18 @@ sighdlr(int sig)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+void
|
|
|
+writepid(struct ntpd_conf *lconf)
|
|
|
+{
|
|
|
+ if (lconf->pid_file != NULL) {
|
|
|
+ FILE *f = fopen(lconf->pid_file, "w");
|
|
|
+ if (f == NULL)
|
|
|
+ fatal("couldn't open pid file");
|
|
|
+ fprintf(f, "%ld\n", (long) getpid());
|
|
|
+ fclose(f);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
__dead void
|
|
|
usage(void)
|
|
|
{
|
|
|
@@ -96,7 +108,7 @@ usage(void)
|
|
|
fprintf(stderr,
|
|
|
"usage: ntpctl -s all | peers | Sensors | status\n");
|
|
|
else
|
|
|
- fprintf(stderr, "usage: %s [-dnSsv] [-f file]\n",
|
|
|
+ fprintf(stderr, "usage: %s [-dnSsv] [-f file] [-p file]\n",
|
|
|
__progname);
|
|
|
exit(1);
|
|
|
}
|
|
|
@@ -134,7 +146,7 @@ main(int argc, char *argv[])
|
|
|
|
|
|
log_init(1, LOG_DAEMON); /* log to stderr until daemonized */
|
|
|
|
|
|
- while ((ch = getopt(argc, argv, "df:nsSv")) != -1) {
|
|
|
+ while ((ch = getopt(argc, argv, "df:np:sSv")) != -1) {
|
|
|
switch (ch) {
|
|
|
case 'd':
|
|
|
lconf.debug = 1;
|
|
|
@@ -146,6 +158,9 @@ main(int argc, char *argv[])
|
|
|
case 'n':
|
|
|
lconf.noaction = 1;
|
|
|
break;
|
|
|
+ case 'p':
|
|
|
+ lconf.pid_file = optarg;
|
|
|
+ break;
|
|
|
case 's':
|
|
|
lconf.settime = 1;
|
|
|
break;
|
|
|
@@ -190,9 +205,11 @@ main(int argc, char *argv[])
|
|
|
reset_adjtime();
|
|
|
if (!lconf.settime) {
|
|
|
log_init(lconf.debug, LOG_DAEMON);
|
|
|
- if (!lconf.debug)
|
|
|
+ if (!lconf.debug) {
|
|
|
if (daemon(1, 0))
|
|
|
fatal("daemon");
|
|
|
+ writepid(&lconf);
|
|
|
+ }
|
|
|
} else
|
|
|
timeout = SETTIME_TIMEOUT * 1000;
|
|
|
|
|
|
@@ -271,9 +288,11 @@ main(int argc, char *argv[])
|
|
|
log_init(lconf.debug, LOG_DAEMON);
|
|
|
log_warnx("no reply received in time, skipping initial "
|
|
|
"time setting");
|
|
|
- if (!lconf.debug)
|
|
|
+ if (!lconf.debug) {
|
|
|
if (daemon(1, 0))
|
|
|
fatal("daemon");
|
|
|
+ writepid(&lconf);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (nfds > 0 && (pfd[PFD_PIPE].revents & POLLOUT))
|
|
|
@@ -316,6 +335,8 @@ main(int argc, char *argv[])
|
|
|
msgbuf_clear(&ibuf->w);
|
|
|
free(ibuf);
|
|
|
log_info("Terminating");
|
|
|
+ if (lconf.pid_file != NULL)
|
|
|
+ unlink(lconf.pid_file);
|
|
|
return (0);
|
|
|
}
|
|
|
|
|
|
@@ -398,9 +419,11 @@ dispatch_imsg(struct ntpd_conf *lconf, const char *pw_dir,
|
|
|
memcpy(&d, imsg.data, sizeof(d));
|
|
|
ntpd_settime(d);
|
|
|
/* daemonize now */
|
|
|
- if (!lconf->debug)
|
|
|
+ if (!lconf->debug) {
|
|
|
if (daemon(1, 0))
|
|
|
fatal("daemon");
|
|
|
+ writepid(lconf);
|
|
|
+ }
|
|
|
lconf->settime = 0;
|
|
|
timeout = INFTIM;
|
|
|
break;
|
|
|
@@ -528,7 +551,7 @@ readfreq(void)
|
|
|
freqfp = fopen(DRIFTFILE, "w");
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
freqfp = fdopen(fd, "r+");
|
|
|
|
|
|
/* if we're adjusting frequency already, don't override */
|
|
|
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
|
|
|
index 7e739c4..864d4c4 100644
|
|
|
--- a/src/usr.sbin/ntpd/ntpd.h
|
|
|
+++ b/src/usr.sbin/ntpd/ntpd.h
|
|
|
@@ -241,6 +241,7 @@ struct ntpd_conf {
|
|
|
u_int constraint_errors;
|
|
|
u_int8_t *ca;
|
|
|
size_t ca_len;
|
|
|
+ char *pid_file;
|
|
|
};
|
|
|
|
|
|
struct ctl_show_status {
|
|
|
--
|
|
|
2.6.4
|
|
|
|