From nobody Fri Mar 04 16:52:29 2022 X-Original-To: dev-commits-src-main@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 E6DC419EBC6E; Fri, 4 Mar 2022 16:52:29 +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 4K9DRd5DPVz4Rqx; Fri, 4 Mar 2022 16:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646412749; 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=mNKonpRWgo3jqOuhuFdxz+2IO8lbS6ASXcIKw9sIAMs=; b=XN81TjGymdRelR8gwSMpeB6s2PSTJRy4cUP9zExGf1SuKhE0UCHl1zUidZKscS9mqZuJix T35Yy2bwjLQhsMlgZuYQ+9vTKRpUVled3HdTaR7tL3wu7SQoEhs3kSJ0fdaGDcJ+y662OB gQ7J5bl7yvNtX0tEXaVTxdletfYKWKRDBHyjajAEUiV+buPIvqRuYlk7trh+dIeNt5xieW 0F5BMKPdKNfhdoD9wNJ6eYqgRAhPsvtTVFhh3FO16ZyAQ3TrSFj/R5DzV3laiWxMJP6Ymw ktzhaAgXg+ZfFP/VQxw73e9oldXVaZtnTsLQyLwprN+b6w3kedgzuGbTu1yGdQ== 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 887EC7CFB; Fri, 4 Mar 2022 16:52:29 +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 224GqTS9038021; Fri, 4 Mar 2022 16:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 224GqTFj038020; Fri, 4 Mar 2022 16:52:29 GMT (envelope-from git) Date: Fri, 4 Mar 2022 16:52:29 GMT Message-Id: <202203041652.224GqTFj038020@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: c1a76c0486d6 - main - rc.d/ggated: Simplify service script List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c1a76c0486d68b09cbb69e0b5d19385c1b223baa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646412749; 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=mNKonpRWgo3jqOuhuFdxz+2IO8lbS6ASXcIKw9sIAMs=; b=g7TL6prAtbP9K2WQxoeKbFjEum1bMRaQDt06bOJuP3uwIulh74YZDMpRyulJCx45vJeqQ4 4HU1tENjQbBib03tUhEpibuEckctGT8jkRoTwoJOQ0h6n3ftSNe7J+7jT3N3h/Qne02JpI IYf2giXbI1AIqFs2TZJldml1UobzwlGMMZwDrqA7Ty9/B+gviyY6tVkuFiUVtTo7LGm8tR wwFOI0PV5XepMAwiNOOKDxILBWFRTHk33erwhF5KEvcEPbCJFBQLX4B4DVDgbccwYwNWeE rh79w4RHh5TO7rqbX5XBsIJYoe+oZ6djSMTQTYTRny2y7bULA+sd/+50I57MSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646412749; a=rsa-sha256; cv=none; b=XZsDksVcVgEZhU3CkSZD6Hz8fWWu3yEm36adpEvA+loyiNbm+WInag8t2zgEPuBh4EV6DK U+z52wqGCPlgER2j4ox6BKQ7VM9WmAHYjOM0KkiiFKFmUEFjr4GoBwQv1CN1svCpM6i+dd RUK/TLZuj3MO69bDEtLHVZS4AEA4q8kJOMj91vZcI+QjpVjRiJuzCXpnfX0Ut2z8kwiSxV FFLzBCqUhvVLG5vCg2T0H3NG1SMjrRGpe578DE70IhuTA2xKeJFVRr90+tGyCC81Nxhcf0 YrDgaSEPFWXLIzHtyNQZEzLSCQfS+hrnq+yBaONXdTT0FaP7VaHn4k6CzYDpMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=c1a76c0486d68b09cbb69e0b5d19385c1b223baa commit c1a76c0486d68b09cbb69e0b5d19385c1b223baa Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-03-04 14:53:01 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-03-04 16:50:42 +0000 rc.d/ggated: Simplify service script - Use the standard *_flags variable for additional flags. - Style: do not create unnecessary variables - Do not set the defaults in the service script. This is what /etc/defaults/rc.conf is for. - Do not set additional flags via commands_args. ggated_flags are already included in the final invocation. See rc.subr(8) for details. - Document the meaning of ggated_config in /etc/defaults/rc.conf. Approved by: eugen (src) Fixes: c068632981eb Add ggated rc script Differential Revision: https://reviews.freebsd.org/D34439 --- libexec/rc/rc.conf | 4 ++-- libexec/rc/rc.d/ggated | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 23a397c3b4ad..a497740eff85 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -297,8 +297,8 @@ hastd_enable="NO" # Run the HAST daemon (YES/NO). hastd_program="/sbin/hastd" # path to hastd, if you want a different one. hastd_flags="" # Optional flags to hastd. ggated_enable="NO" # Run the ggate daemon (YES/NO). -ggated_config="/etc/gg.exports" -ggated_params="" # Extra parameters like which port to bind to. +ggated_config="/etc/gg.exports" # ggated(8) exports file. +ggated_flags="" # Extra parameters like which port to bind to. ctld_enable="NO" # CAM Target Layer / iSCSI target daemon. local_unbound_enable="NO" # Local caching resolver local_unbound_tls="NO" # Use DNS over TLS diff --git a/libexec/rc/rc.d/ggated b/libexec/rc/rc.d/ggated index dc31468920ef..22bc8beb7ca0 100644 --- a/libexec/rc/rc.d/ggated +++ b/libexec/rc/rc.d/ggated @@ -12,10 +12,8 @@ command="/sbin/${name}" pidfile="/var/run/${name}.pid" load_rc_config $name -params="${ggated_params}" -config="${ggated_config:-/etc/gg.exports}" -required_files="${config}" +required_files="${ggated_config}" -command_args="${params} ${config}" +command_args="${ggated_config}" run_rc_command "$1"