From nobody Fri May 9 14:59:05 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 4ZvBwV0fX9z5vmqJ; Fri, 09 May 2025 14:59:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvBwT4VKmz3nyM; Fri, 09 May 2025 14:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746802745; 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=suffmhzofC9CwAMDW9Grxf4t6M6ye9A3tG9CzJ8qmxk=; b=quwVeC7LYCr3Q/bphwOIl/eJ5/nrlSPLgNidBIqNTKIty5VZZAqUUH+neBmcDfjNvh8I+Q hVqRNrTCvvSQDSJ85bLe9/jR+CKQYmMxChR+22VH8DmOBXKwLewjO7OU1aw78V5blb5W42 k9oc68tmWS/rEHD+et1QzGvtKfhqxKDjqEcO9WkSFbZ+Q6kFi2JDtCaUQZYj7XHg/qRWSl tJDMgfHSdzpieHQgwAtFjum8EivFYa/Q5NOOnB+k1UqJO8J8TJAsviuvxJ7oYKl2s7qf// KOFV7w6bU7Y9R2qHzWbN71Kptc9i/Vq3RbOkvWtC0bPCkLYAnPI2XEnTPMEicA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746802745; 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=suffmhzofC9CwAMDW9Grxf4t6M6ye9A3tG9CzJ8qmxk=; b=wu2O+MZQGIWZeh+VfuZjypYymCwYwWvCqa2My720eAtAPrAQWEMvwJk7gd4P8zmNiFpkJL k6kiL6homIDDnqNRBhBFTIwNL5wqgSDy3kzWQUEDzGaJiN6QNNFNj6EwV1mXShSwDZoAKD cWg8LKiUkDOIq5RY2rFZJ1p90zp9a72LUiliC4U5rrIaoeVAterBaAVHqN5oThXYqUsgbf xFJgKXqNlBV8CuyrlgdyxOqo9PmDlhSjDQCWQQq2HdEZWui1O1eeg6yZGjZQxJ2cBTFX3y q5a+E9CagEyWMfJgt2Eb3E0Gg3Bq3UYDEGe6zi4hNOPRnaWwOm/V9SGLO1CC+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746802745; a=rsa-sha256; cv=none; b=fi16wFbxPRu5CgMyi5hxuD+xmTboWzl5nhVuPxP7iXn/cQCtBp/XANllGKsiziH3NH3MzE YQPsWYItec9jjLidv7ch3uxaufqavNzWeAjbtdBbNjuRdAFCrPNt/quU7hZVLvhgmeNm/h sc2ezum6btrYcb7MvKQoVSXc2gTcA1O8yqYjmySVA4KbO+Wn/VajXSLutXnuzBYIwvAVBX S6aFyrGSBI/Au1zzcuO6nKxyvfhFpVd3FmsswZg5+6mIceETosytZWypNFYOUSRsDT0npa JdMRL0FiUJMYXM4YsvQKL+rMr7rmqkLxyEMU92PeQWYcSsE1K43Y+MWYBW+Lqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZvBwT3c5gz14qh; Fri, 09 May 2025 14:59:05 +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 549Ex5ND041363; Fri, 9 May 2025 14:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549Ex5IX041360; Fri, 9 May 2025 14:59:05 GMT (envelope-from git) Date: Fri, 9 May 2025 14:59:05 GMT Message-Id: <202505091459.549Ex5IX041360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 7ffedfe14ca8 - main - service(8): Allow for passing no arguments to the service script 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ffedfe14ca85aa3474980092a732d4e49309c62 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=7ffedfe14ca85aa3474980092a732d4e49309c62 commit 7ffedfe14ca85aa3474980092a732d4e49309c62 Author: sd@mostnet.ru AuthorDate: 2025-05-09 14:48:27 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-05-09 14:56:58 +0000 service(8): Allow for passing no arguments to the service script Currently, service(8) requires the user to provide a command to the rc service script. For example, service cron does not even run the cron rc service script but instead shows the usage message of service(8). This patch makes it so running the rc service script with no arguments via service(8) is closer to running the rc service script directly (e.g., /etc/rc.d/cron). Long story short, for most of the rc service scripts this change means that running "service FOO" now shows the usage message of FOO instead of the usage message of service(8). PR: 255115 Reviewed by: bnovkov, christos, imp, lme, markj Approved by: bnovkov (mentor), christos (mentor), markj (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47328 --- usr.sbin/service/service.8 | 4 ++-- usr.sbin/service/service.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index 1adff6a0de49..a8f1a509885f 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 April 19, 2025 +.Dd May 9, 2025 .Dt SERVICE 8 .Os .Sh NAME @@ -48,7 +48,7 @@ .Op Fl v .Op Fl E Ar var=value .Ar script -.Ar command +.Op Ar command .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh index 245430107277..8b7aa937967b 100755 --- a/usr.sbin/service/service.sh +++ b/usr.sbin/service/service.sh @@ -162,7 +162,7 @@ if [ -n "$RCORDER" ]; then exit 0 fi -if [ $# -gt 1 ]; then +if [ $# -gt 0 ]; then script=$1 shift else