From nobody Mon Aug 11 19:22:29 2025 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 4c14K20K5qz64nNx; Mon, 11 Aug 2025 19:22:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c14K12wgTz3YZv; Mon, 11 Aug 2025 19:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754940149; 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=AWHLbaFsPmmRsafcH77bk1BoPO7O7GroAlh18oPReWY=; b=FPdQqJPoJ4+FRdgn2uFNCM0eC6hk1J5Xw7BNzJzXVpak8Qf6WRKCDP+JyzaFiJhXQOe9eK PiCDV3d0hWiS8j3gCzyChpQihy+BE+lhqvgD3b87NTtkjOlyOgEhWyszG5C2fZGO/TESrc YTCbRHpa+mZTsBzOmUHuOG5tz48ev22KITcjnRK8W0SVglEbKI0gKnDXMHszphGzVAt9eU OMHWl0C7hASDjc7CvePqrxMTnGm3SaiQ/2dXsTrM0uVy0Z2/F7QQ4nlyVGgA+pM8Ob8l2N mFJ9hxezUT7oatgEHfdaT41sN/jZL/p/mruX9JxBbbxGOb5hHXaoRYS0Ri71NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754940149; 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=AWHLbaFsPmmRsafcH77bk1BoPO7O7GroAlh18oPReWY=; b=UXjxOAECyBUYHVWYRES3Do8/sluK2IfAjw35f6QCQpTgqB2gyxCtk459A5iiYUbtfp/LeL z6B5REa+frnsnv75z0+G2Ts4U5fKfK+Vca/LTFix8uxhGDhjiggpUKkewoOvjvWtm3pbM+ flkM7gMXSDKFHzRi/Qua2rlLCfPwjT4p2r7QdcmWKnFtmIPfhKBp4yPGnzUEBMiQlAzCUK PD9lHVAyiCoVU1Vxs/PH+O75WrF1OI39I9+DbeAaLf/6UhQcOAS95+q/PMlaYGJp3SmueC 5Ws9O1G3B81fqHSNQJb7PYsBdbeG2nktItMZdqwPd4pb+0TvzknSduF8tf0JJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754940149; a=rsa-sha256; cv=none; b=GPihmn9FIxfj2LzqbnpoYirL/RPRVxzsigjMRl6TcaANjzRyebrrff2JGo2K7R3SM4qmev SbvFjOLIVytcURtqT/VDEKn12ARfIbHBQU/+P/dBiuwALg7Ni/j5IhijNDXFOY6rKs0sUM BAGgW1TkL0guMxgQPnZSUoMk0fX8eSBEzICXQa+wHihLaoT22lXFukZf/AoVHNpEZzFIDS hYkdNwLNfRPKfAV4hxtqMyHwhbCPWoYwWPorTrbDnc4/kB42ucQe3tsvWKib1Gqtlej0xt 8CjOktJdMS+QjVc8e/lxx5j/kartL+jYVEsYC0q6178qWfOjlmmBBP+k9mKElw== 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 4c14K12Kjqz15FB; Mon, 11 Aug 2025 19:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57BJMTYk012267; Mon, 11 Aug 2025 19:22:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57BJMT0m012264; Mon, 11 Aug 2025 19:22:29 GMT (envelope-from git) Date: Mon, 11 Aug 2025 19:22:29 GMT Message-Id: <202508111922.57BJMT0m012264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bb3fd5897add - stable/14 - service: Add an option to enable debugging 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb3fd5897add9f407f30e288d5d52082953aa1e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bb3fd5897add9f407f30e288d5d52082953aa1e9 commit bb3fd5897add9f407f30e288d5d52082953aa1e9 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-02 23:59:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-11 14:31:26 +0000 service: Add an option to enable debugging * Add and document a -d option which enables rc script debugging. * Sort and document existing options correctly. MFC after: 1 week Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D51700 (cherry picked from commit 25fca243f2b7ca0c523aa1cf26aaea25035e68d2) --- usr.sbin/service/service.8 | 13 ++++++++----- usr.sbin/service/service.sh | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index 67597bf9258e..be68694b1be0 100644 --- a/usr.sbin/service/service.8 +++ b/usr.sbin/service/service.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 9, 2025 +.Dd August 2, 2025 .Dt SERVICE 8 .Os .Sh NAME @@ -34,6 +34,7 @@ .Fl e .Nm .Op Fl j Ar jail +.Op Fl q .Fl R .Nm .Op Fl j Ar jail @@ -45,8 +46,7 @@ .Fl r .Nm .Op Fl j Ar jail -.Op Fl q -.Op Fl v +.Op Fl dqv .Op Fl E Ar var=value .Ar script .Op Ar command @@ -74,6 +74,8 @@ scripts, see .Pp The options are as follows: .Bl -tag -width F1 +.It Fl d +Enable debugging. .It Fl E Ar var=value Set the environment variable .Ar var @@ -106,6 +108,9 @@ this is usually .Pa /usr/local/etc/rc.d . All files will be listed whether they are an actual rc.d script or not. +.It Fl q +Be quiet, redirecting output to +.Pa /dev/null . .It Fl R Restart all enabled local services. .It Fl r @@ -116,8 +121,6 @@ as in above, but list all of the files, not just what is enabled. .It Fl v Be slightly more verbose. -.It Fl q -Be quiet, redirecting output to /dev/null. .El .Sh ENVIRONMENT When used to run rc.d scripts the diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh index 5f456418da49..9387a49051d6 100755 --- a/usr.sbin/service/service.sh +++ b/usr.sbin/service/service.sh @@ -27,17 +27,19 @@ # SUCH DAMAGE. . /etc/rc.subr -load_rc_config 'XXX' +load_rc_config usage () { echo '' echo 'Usage:' echo "${0##*/} [-j ] -e" - echo "${0##*/} [-j ] -R" - echo "${0##*/} [-j ] [-v] -l | -r" - echo "${0##*/} [-j ] [-v] [-E var=value] start|stop|etc." + echo "${0##*/} [-j ] [-q] -R" + echo "${0##*/} [-j ] [-v] -l" + echo "${0##*/} [-j ] [-v] -r" + echo "${0##*/} [-j ] [-dqv] [-E var=value] start|stop|etc." echo "${0##*/} -h" echo '' + echo "-d Enable debugging of rc.d scripts" echo "-j Perform actions within the named jail" echo "-E n=val Set variable n to val before executing the rc.d script" echo '-e Show services that are enabled' @@ -49,12 +51,13 @@ usage () { echo '' } -while getopts 'j:E:ehlqrRv' COMMAND_LINE_ARGUMENT ; do +while getopts 'dE:ehj:lqrRv' COMMAND_LINE_ARGUMENT ; do case "${COMMAND_LINE_ARGUMENT}" in - j) JAIL="${OPTARG}" ;; + d) DEBUG=dopt ;; E) VARS="${VARS} ${OPTARG}" ;; e) ENABLED=eopt ;; h) usage ; exit 0 ;; + j) JAIL="${OPTARG}" ;; l) LIST=lopt ;; q) QUIET=qopt ;; r) RCORDER=ropt ;; @@ -85,6 +88,10 @@ if [ -n "${JAIL}" ]; then exit $? fi +if [ -n "$DEBUG" ]; then + VARS="${VARS} rc_debug=yes" +fi + if [ -n "$RESTART" ]; then skip="-s nostart" if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then