From nobody Wed Apr 17 05:48:49 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 4VK9294W7Qz5HvPV; Wed, 17 Apr 2024 05:48:49 +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 4VK9293p0vz4pdv; Wed, 17 Apr 2024 05:48:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332929; 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=IzB6Rwi9BWXHFnjn6kVxl2CR9fsCnCF/10ARKEUB3S0=; b=AJsUQfIAdq8Jz6Z4X4TOxLKbqCYr9aZETuxlrkeerwkKCU3E8vt1ljhoDsDFSWU2XOJ/95 XTRHy7lelRcv8opS8zcOvJ/Mc3SwFNNMvz/IuuZaoevQ1mqjW1ejo1OAZQv6hudNE38yPM W6dmyFymEo047XgbzcoDjJ01+Uog65s7iGqKsEww+WrRgG505YKRkH4kZBYZxa8vhVMiBF AJIqd8Ov8MizzqdYLcUQK4SysISUO7l9aQtyZ8nTrXCOboRMxDj0g4aufsZsJ45lb2wI7y 0hLORwNudCXWR8Vwq6mZZuRTBfzkLgF/ryEzOxKDbvEAPypOcu/9pPtorfDEKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332929; a=rsa-sha256; cv=none; b=lr3j6639Y+M2QuQdFQ9FDYoB5ttHFqZNSZv8qzraNC3aQSHx9RfwYxqs5qcZdLLR2b6ycc 4422sKqDoG44nX4LSDYTN4GNESDQsZVaX8UlNaxX9WkW0TZfZI5NkK6qHwv3ilE4dpBALV LTuy649dCPmF5ap3UlgTLUzHN25XpEA4rSRhy2wZsiyIzuJ5f/2ztvKpdKNaOM3ut9cahl Qt91VH7d+R/Ln+Kk8f3pjrsOku382wzqI1SSnUyxftvLCJWDUN+mvJgW+7W+tPxXP0POxp /MUzjG777te7aN3JxD6IVLXH8kyn2aDWwb/mL4EuRZTaq/y/GtZ/5qNeaCpnAg== 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=1713332929; 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=IzB6Rwi9BWXHFnjn6kVxl2CR9fsCnCF/10ARKEUB3S0=; b=KUtIoqyEiPuG57Vfso363QjoD/K5r8iV2xsPedj9DrBFknaX2pULcBYPkD+fXrgl6W1va0 mlHcBPnouxMHxDjLXSJtyS5EsRESrfFJxBK1fFYC8s3WtXykyrue+KXeuXVJZAv4pyo2oF p3jbnm2hlJW70TvVjL6g21HP16JJCsj8AVDEDyhIEaMT12m3bVaxlvPTr6lU/xX1SouqS5 gbrLHqRxHMOvVbTtFhciL/ZcSRJPCZyOrGoTmJylnmpz+RlYPdkhgprYEj44U8yOwqtGha DEl3AcUUB0lY4vCWTsKKAsf1I24sx/Gqffgpnj2lGNhQlejMAjvGxm3biRxjGw== 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 4VK9293QJ1zF9K; Wed, 17 Apr 2024 05:48:49 +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 43H5mnvq008033; Wed, 17 Apr 2024 05:48:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5mnf3008030; Wed, 17 Apr 2024 05:48:49 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:48:49 GMT Message-Id: <202404170548.43H5mnf3008030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: a871d0f13c56 - stable/14 - 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 Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: a871d0f13c56f6ea2ec86ed8175634b562de514a Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a871d0f13c56f6ea2ec86ed8175634b562de514a commit a871d0f13c56f6ea2ec86ed8175634b562de514a Author: Mathieu AuthorDate: 2024-04-14 03:10:06 +0000 Commit: Kyle Evans CommitDate: 2024-04-17 05:48:26 +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 [..]") (cherry picked from commit bbc6e6c5ec8c7938b98a36899fa083aa7ce4724e) --- 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 da8e4895e19b..52fbfca1dcd2 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -243,6 +243,7 @@ main(int argc, char *argv[]) if (p == optarg || state.restart_delay < 1) { errx(6, "invalid restart delay"); } + state.mode = MODE_SUPERVISE; break; case 's': state.syslog_priority = get_log_mapping(optarg,