From nobody Wed Apr 17 05:50:15 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 4VK93r0PDlz5HvQF; Wed, 17 Apr 2024 05:50:16 +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 4VK93q6zb3z4q3j; Wed, 17 Apr 2024 05:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713333016; 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=GdOuDBCqDB/6J/CAGa+EX/88OudbNZTiS6IQh0feCAU=; b=VrgjfaHxWTEZeKclWtzB2cjqYwLJN0iBtAYKUTkp61Ieh88TjxqMj/EUWrQONXIEt4DRok YQfvln2gqf+bh5k26ns3C5zdQATxYemQV5yZ7yx06H3Ujifzgt5BZhO4NNt/dACevL9ZxC wddCRq2IucpyaAi8fYK6bkFNzimSlFAukBAfR+FmtUZqyVBO5M9qLSp2rXbwNv1SzFjzYN JznIQiZZNfrPpOsavg3U1Z/uiNNmStExnjMKbEoSe9dAsQ0URegbBypuvtyIV2w7MYhrSP ymk76fuAFJ/SCSlWw1ggtDAC3QB4ObFgfwoxNV1Y+dzbd1bDX+Gof+i0yBhAtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713333016; a=rsa-sha256; cv=none; b=vjb3h9uQ/fnxMxMDzyiSzkW24Z+fXOyqfI0+CMo6yzhG1hcY8916tzD9vt/lZhEiMDU9z8 XSkybC90oivpSqJVsHhMDfuJJGtM/urty13X/Hn3ZyWSHGCfr0pV8wOrZNYy5OzPl1mX4c T9yUtIwVmUSmasbLCJup/IfR+WimodsyztLM9Yi4LpVttRkEw3jCGNiewxCgV0i+zrtuhz K2XGQfzwv9leSy72Rf/jMirgKD0Qag3R0uEXdwe0OfeT4Wb0ewMCr+HDPc5h2MXopiUwis 12yPybaH0f9Iohf23sVUP7WZe/sJBCnB3a1WKlDWtCsoHfKPD99/fBy06eWNAA== 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=1713333016; 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=GdOuDBCqDB/6J/CAGa+EX/88OudbNZTiS6IQh0feCAU=; b=fW+7xzctMJgDbxOQI2iVk14Lgrg5nOm5pxhixS+1yvD4LI3j63cxgzofAGJ/yDIdh+65uB RnojHcORovn44vkEL1KSo/rAMdVYcq3xGhAnviEslMqzogC9RZBzud6ryTRgnS9ZziDRpE y3yBTRAM9Qctok4qXSe2AEztCHkXDBIEweSW3jlQJP9GVQZRMnIZbZbY3d3Wfiyhe2RoWM VKEubWyGqUZ1RCTRPGC9Yj5s/vcoyTppw5xL1XzxIGHe3rQwrbkbSJ9WCkpiy65AgCn8NM owR2WsuilamGg3Tmvw8JpzHEcRJieoUeG0ls8ZZex+ve6WGuYwqFOtlmzU8Urw== 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 4VK93q6ZjPzDx5; Wed, 17 Apr 2024 05:50:15 +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 43H5oFU0015706; Wed, 17 Apr 2024 05:50:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5oFR3015698; Wed, 17 Apr 2024 05:50:15 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:50:15 GMT Message-Id: <202404170550.43H5oFR3015698@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: 1e2be096d425 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 1e2be096d4252308db35b0424bd408c2b8aa5990 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1e2be096d4252308db35b0424bd408c2b8aa5990 commit 1e2be096d4252308db35b0424bd408c2b8aa5990 Author: Mathieu AuthorDate: 2024-04-14 03:10:06 +0000 Commit: Kyle Evans CommitDate: 2024-04-17 05:50:03 +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,