From nobody Wed Jul 13 16:47:40 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3335117FC65D; Wed, 13 Jul 2022 16:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ljk7c6rgMz3WkW; Wed, 13 Jul 2022 16:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5BSb8dd9gQvluB0/Rlgdqr9ilOdgO6rvtHTyj+Hmkc=; b=BWSISvGDFoFcW1BZrf9qeCN6Ka8Bc4k5/hkyMgoAkxmjtuKNBkvE9GB67g0O+TBvavdoDJ Iio/5K1vad/qLxWiPKlUyf8mei7dATQ9KIjpQTkeYH7qUOWk+kyOHyWgopLyIkpgWeGiDz NwZ5iIMo22fPu3lHJhZ+vw0ZV+hf9R4p7JsT3p49/LnnKGCSfyBks6eyIJTSmZC4LBM7Iw LxPx8cELXn7iXcGWC/jPkiKDdwD/UDeh6q3yD6i2rsTMjAiSmcpIyq9q0bobCRxt/cMQGd QO7qyvB8JIh/SPCiL/71XO3rh4v3CbXI8skt1BmIb61u/wO2Jywsu7riUqUMgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ljk7c5xvCzWBy; Wed, 13 Jul 2022 16:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26DGleJ1052251; Wed, 13 Jul 2022 16:47:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DGle8q052250; Wed, 13 Jul 2022 16:47:40 GMT (envelope-from git) Date: Wed, 13 Jul 2022 16:47:40 GMT Message-Id: <202207131647.26DGle8q052250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 498f1c8ed2cf - stable/13 - rc.d/ntpd: Restart ntpd when resuming from sleep. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 498f1c8ed2cf0f9748b0b96b197720f1cc45642b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5BSb8dd9gQvluB0/Rlgdqr9ilOdgO6rvtHTyj+Hmkc=; b=yRtKZTnE5BNC08FO7bs5Vb8RFABkBN5VDmqQUprr/ZFR/0eMR9jHAcYNvOSwxGoJYvScgM 4XW14SZMVNwybRSoR2DFW202lKQ7MmqGB1xjfYuek4ee3X0r1hXaZY4zMSXcUlNSvVSiVH uMZhm0m7fHQOZ19QgbxB9W+cbPDfhtvxl9LFx2prhud73KRsIfbBmBrewZ+vD7iIUsliz+ tyItvP/5PRxNCOIKMwqLjV4jXYAuXJ5ju8WqY5c2eJqEnweq15bvN2l0HUg9YlPpqBP9dv OjnbV+d3L4tC164BKEARS4Xuag272pdNri6Auiwga+uMI1gPz602/GTnxhhM3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657730861; a=rsa-sha256; cv=none; b=B1BFzJjbRfXfP/sVklwsoyUjryUXDqoEIfZGf53ZmbxWB+8eHJ6jRenCGmmdAWvKge34iM kJ/czjP7KCkCvfCipWjftnMZ+kNJANlqLgdWZQgPzgc0f+7OTojk16Ipq4m4qu0CNQc8vU 3MEgbsPR61vc4jMe2fIL0jMWocHSzI9MDibJDAVvlbA7HAIPG0lFai5nAL37CV5yG8MGpi F+caq/u9tGKG/HrfrRE4iHCHQ5abGVqX2UGQXAgWtHafH/oUL17Gep8W86yJhEA6Tuc2nq ln9c3o6AL4PPYbNC7/SywAGlTFIOA08TtWsZlYg2uOPNSoTooW0feZzYHcPpqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=498f1c8ed2cf0f9748b0b96b197720f1cc45642b commit 498f1c8ed2cf0f9748b0b96b197720f1cc45642b Author: John Baldwin AuthorDate: 2022-06-14 17:42:51 +0000 Commit: John Baldwin CommitDate: 2022-07-13 16:19:45 +0000 rc.d/ntpd: Restart ntpd when resuming from sleep. ntpd does not always gracefully handle clock steps during resume. This is probably most useful in conjunction with ntpd_sync_on_start=YES which will work around any clock skew while suspended. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D35479 (cherry picked from commit 1442fed7e25e9856464a0b0ce522ffc8cb473593) --- libexec/rc/rc.d/ntpd | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/ntpd b/libexec/rc/rc.d/ntpd index c1d2f52a01b7..7c7879583185 100755 --- a/libexec/rc/rc.d/ntpd +++ b/libexec/rc/rc.d/ntpd @@ -6,7 +6,7 @@ # PROVIDE: ntpd # REQUIRE: DAEMON ntpdate FILESYSTEMS devfs # BEFORE: LOGIN -# KEYWORD: nojail shutdown +# KEYWORD: nojail resume shutdown . /etc/rc.subr @@ -14,9 +14,10 @@ name="ntpd" desc="Network Time Protocol daemon" rcvar="ntpd_enable" command="/usr/sbin/${name}" -extra_commands="fetch needfetch" +extra_commands="fetch needfetch resume" fetch_cmd="ntpd_fetch_leapfile" needfetch_cmd="ntpd_needfetch_leapfile" +resume_cmd="ntpd_resume" start_precmd="ntpd_precmd" _ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list" @@ -239,4 +240,9 @@ ntpd_fetch_leapfile() { fi } +ntpd_resume() +{ + run_rc_command restart +} + run_rc_command "$1"