From nobody Fri Jul 22 00:28:00 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 4Lpqz52nplz4Wj5s; Fri, 22 Jul 2022 00:28:01 +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 4Lpqz50kLgz3GMY; Fri, 22 Jul 2022 00:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658449681; 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=kbWQekQG2eKTLPa1nf4vJutOwtCBS+viSd7rayHoa2c=; b=ulQfevR/BUzUsTD9w+x7JlJ3vizdESG+kC2abtyOOiUiRMQ+Iq7gt6XYapRAQhltirqUZt /2luNJ3li4vqgiHCygZz0nPIzq+oKt0+gHPjFkMlioBzFL6UPnKf6hJf6iesy6FhY8saUA i/9aGNcxTOaPeUt00eMohL3nWOvgrEOdY1ujmijUkf4ITlX5eETOrB2kl39xEbkJN79BU6 DrPWd6vOWPJT5qQbC55Wn19XIc4o7quTjw3Va7XlJkf57zyBKk76Iuc6tr18Au8FonrrBL aDRw1hUWE28gdDHMjhuFJBPSgRJMdm8fXHiwNR9kTUGem6G/cEjWN879F5N19g== 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 4Lpqz46wJmzhcw; Fri, 22 Jul 2022 00:28:00 +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 26M0S0bK076594; Fri, 22 Jul 2022 00:28:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26M0S0sL076593; Fri, 22 Jul 2022 00:28:00 GMT (envelope-from git) Date: Fri, 22 Jul 2022 00:28:00 GMT Message-Id: <202207220028.26M0S0sL076593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 57df44b2c129 - stable/12 - rc.conf.5: Improve documentation of _oomprotect 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 57df44b2c129fbd652aaf15d071493ed5698167b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658449681; 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=kbWQekQG2eKTLPa1nf4vJutOwtCBS+viSd7rayHoa2c=; b=o/ewNvO+kx1vZSpqGwmHYuKdA6GC87Ojrk9zt2BV0bdLLEhMlQhAI40jkoD2JXo/Al5kUp 4Ro4Yd7DbkU+5aMEZJlIjFRCa0sQ3gbCK8WKv0Rpv996lcvpXRNF2kXX4kb5Jix1o43JkU NiH6iRTrcrdOg2MRcrl2/Kkc6HOo1JU/HuVq/J37rxaXNKJXNI/U9bmLaveNJlPf/20asO TYxynFPpvUVUYgaM+vQOLomzrrKVUJbVna6L5vdN1VHUcdRikPOVk69FKYgFItdbtkyj+Q VZa+0GaOAwZro+UrqX9xX/R9zLtW/M7/JzH4sQ/cpSg2VRDceQhQqhhZUfri9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658449681; a=rsa-sha256; cv=none; b=vTdFUjqfkcYFkPpO7psIZTy0vTMSEQj30i22XY0IOb40Aus8uu7G39ZKi8telo0kR/aPY4 aF+RA7xTZxOnqrCiQOmWf6bx5v1bSy3xroaktBw/2x/F9pSTUL9NjCmc6KQy9lGwOSv4s0 dhXyB+uTX6jjjfk7rKxkVWPtw8BfenihwA3Ml37vJfeNPYYoEvIJRfKhi/gYFopZr+NfPc ZSxi8gEhu9blUZvd4P8CyPHG8nd+q988LMhtSP1nWuqDgrUX9T2fKKleQgRpaFJGJnQ0P1 sksG9L8r6d7URcEkgqm1hyBmnF9HKPIUmR45qqbmvoehHzj1PLOJXeW3CNGycw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=57df44b2c129fbd652aaf15d071493ed5698167b commit 57df44b2c129fbd652aaf15d071493ed5698167b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-07-07 18:01:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-22 00:26:28 +0000 rc.conf.5: Improve documentation of _oomprotect Apart from improving readability, this commit mentions that _oomprotect is ignored in a jail environment. Also, replace ${name}_cmd with the correct ${argument}_cmd and point the reader to rc.subr(8). MFC after: 1 week (cherry picked from commit df1817a81e891c4850157e7f21f94b113d663bec) --- share/man/man5/rc.conf.5 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index fcc8ee5a4a89..e11b25bcd651 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 28, 2022 +.Dd July 7, 2022 .Dt RC.CONF 5 .Os .Sh NAME @@ -216,6 +216,7 @@ The .Xr nice 1 value to run the service under. .It Ao Ar name Ac Ns Va _oomprotect +.Pq Vt str Use .Xr protect 1 to prevent the service from being killed when swap space @@ -224,13 +225,15 @@ Use .Dq Li YES to protect only the service itself, and .Dq Li ALL -to protect the service and all child processes. +to protect the service and all its child processes. .Pp -Please note rc scripts that redefine -.Bd -${name}_cmd -.Ed -such as PostgreSQL will not a inherit the OOM killer protection. +Please note that rc scripts which redefine +.Dl ${argument}_cmd +.Pq see Xr rc.subr 8 +such as PostgreSQL will not inherit the OOM killer protection. +.Pp +This variable has no effect on services running within a +.Xr jail 8 . .It Ao Ar name Ac Ns Va _user .Pq Vt str Run the service under this user account.