From nobody Sun Apr 14 03:13:02 2024 X-Original-To: dev-commits-src-all@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 4VHFjq1M7Dz5GqwL; Sun, 14 Apr 2024 03:13:03 +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 4VHFjp5rwZz4NSF; Sun, 14 Apr 2024 03:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713064382; 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=f+adD7+acOentBvYr9ppxNt5ht7d8JoT94nrlyFNKPs=; b=rXkS3kL3Iweb4cu5PVWwlNmY4AXJfHGw1Gds/+SLRuY6UUjgQDCB87FPsAjzU8ZUtsK49s o5UDJ5HJ/OWoxZgR+5kOAI9/R2qojynE9UgPt9Rn88OAIkYkzO4uhHXA/CPyKTU2+qn6b1 T2Y0e+nUUf0wq4myk/b7Z0bn9PhJBIFmXPJLmLZmaUHEAF3kxBGjAdlVNDzrMqvTscgnOh 2INDyAQShVjmiq8T13eU8fdCxSi4zDgIoTy4fR42sS0T8v9m0HmVVOKcWXfFC7LxDdABpM vtJ7zs3SPxF9CZruYq4KWVoj26nlAJcszgPWHsMRw2KbQ4GEbEuAhD0TJ1Xvmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713064382; a=rsa-sha256; cv=none; b=GBj53d9L7XLRYhsKCxx5Iz/zG5OKR2Dmkzk94//grJBIVRuG1x7/S0by/S2kIET38OVnHT 10PfUL7rLeodmvXsuWOh8hTTBKz0WqCa+AKVjMFl2rmrSY+yhoKtomhh8mEhVTPRCqY1kh 0pV18vaI9kDQHJurCYd1GLyrJWQ0kvcJXJuThOiPJ1vHCwJj0dceZ0bpGuF2sfSvjihQfG QHPjk7ar9V/gAj775ENYmzOANTabSQSUEbmn+TKm2W5UkBLlv+j7/qlgUKN+FsTaDW2twF 1UxEy0/PT+8U9Y0TZZtKYCtkoE7QBAMi82gLQkaiNZVPAMF70SkXWTKDW3DoQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713064382; 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=f+adD7+acOentBvYr9ppxNt5ht7d8JoT94nrlyFNKPs=; b=e42K0yZzHA82kCJwB0b2b+pOwYOiEzNpWzw59FlQMsgL9DNBCOEmv6Ny4pw/yUZqoOwDxm bVQxgswjvT3SKGprIEfiZRmJq9Q6w7/GBGiIKsGCrCkvACsHZ9bv05pn3szoP5Cx+K83o3 4qHLbivb4tJ2EsGltdCys0K4z8O7krJGD2ugXoerlsK8mHbuPvIgnoPL7BnoO7K0agVc4G HLAVWdvYFxFjvyyMC+KWfFyU0HEJyxixPB4uOCPkW2kwgWZpanARXPz7JXZ+2YU/mI/Fy+ cy3fF0T5KyHgBE+axXN0w2/Syyc3qsLJjpE7Ur4x9LJsqDNikKMiVwbexk2X1w== 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 4VHFjp5S9yz102x; Sun, 14 Apr 2024 03:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43E3D2RB033656; Sun, 14 Apr 2024 03:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43E3D2vP033653; Sun, 14 Apr 2024 03:13:02 GMT (envelope-from git) Date: Sun, 14 Apr 2024 03:13:02 GMT Message-Id: <202404140313.43E3D2vP033653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: bbc6e6c5ec8c - main - daemon: fix -R to enable supervision mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbc6e6c5ec8c7938b98a36899fa083aa7ce4724e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bbc6e6c5ec8c7938b98a36899fa083aa7ce4724e commit bbc6e6c5ec8c7938b98a36899fa083aa7ce4724e Author: Mathieu AuthorDate: 2024-04-14 03:10:06 +0000 Commit: Kyle Evans CommitDate: 2024-04-14 03:12:36 +0000 daemon: fix -R to enable supervision mode If we're doing restarts, then we must supervise -- the 'R' case simply got missed. PR: 278342 Fixes: f907027b49d ("daemon: set supervise_enabled during [..]") --- usr.sbin/daemon/daemon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index dd3315dadee4..26e34d1d2e2b 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -248,6 +248,7 @@ main(int argc, char *argv[]) if (e != NULL) { errx(6, "invalid restart delay: %s", e); } + state.mode = MODE_SUPERVISE; break; case 's': state.syslog_priority = get_log_mapping(optarg,