From nobody Fri Dec 10 12:32:48 2021 X-Original-To: dev-commits-ports-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 325AC18D2B49; Fri, 10 Dec 2021 12:32:50 +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 4J9Vfn2PRyz3tTK; Fri, 10 Dec 2021 12:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ADA851A367; Fri, 10 Dec 2021 12:32:48 +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 1BACWmLf069515; Fri, 10 Dec 2021 12:32:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BACWmmv069514; Fri, 10 Dec 2021 12:32:48 GMT (envelope-from git) Date: Fri, 10 Dec 2021 12:32:48 GMT Message-Id: <202112101232.1BACWmmv069514@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: cfb42af2af3e - main - sysutils/py-prometheus-zfs: Initialize rcvar List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfb42af2af3ecea743a3dfc4bdfb009d13d02076 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639139569; 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=G1vKDQFknN3ehIP2fc4afBDF7WzhszoTuTzlr2EH9Mk=; b=nfWGjmNMYSM/Y3Z6msBKozN9cSB4nqBjr0/Dixfy3QNpL729yOiqbcAylyjkMpS4LTYCSN d+1BJApT5/qpmQ3b3L2s9ydrL+G1MNMZWm1BuKTh0h05mhq7ZY+g5kMKOhF0Q+0FzRlpxQ twYUfLrYdPHgLQTeZm1YMF00NLWUgxDIzzCdfMHiEwvp9zUdtP/d4jfNQbpqG/ImhIvEYU CxODf6FYtG0dlEqC0+gRork9mxKiNIkVe7+Dq5oD6THuoVOtVe1u8ecU7TGOSM8boK6B+C k2b/rrdALpKYcIjZgdo3iVtJ9YO8QhhPbTAsrfeyuSAIGeyE7kW9aRstbpTGwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639139569; a=rsa-sha256; cv=none; b=UDmQ6A/ETLr/4PnoTuflKcnrJI23nThrBFOtSlY22jThiZKUwGufmy1NTmK2D1VA+iPPHG 9GwUm0+/OJQ+T++GPvMVzgHJWM1zigI+oOZjcLA2UC4XVYhixebJOyTi5Zhw+uBiPgdM7O Y5cg70slfdjiCmkr1Rwgtlkxe2qV3Nq8RGHYyGChkLtuz8al32wqT+skVdlcIeG1cXUfJx Dx/YmqQ1YeR26Lm8C0i4ewW4+9T0qhKhJHQlPID+fjPx6MpjtWdb8Y8qG+zwwIkJsODSro ZEzvY7eEpAFgdkveUtqPKwbhfPpEUIX+JeghDKhc4g/KA09m0rTf2+uJwipz3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=cfb42af2af3ecea743a3dfc4bdfb009d13d02076 commit cfb42af2af3ecea743a3dfc4bdfb009d13d02076 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-12-10 12:28:07 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-12-10 12:32:25 +0000 sysutils/py-prometheus-zfs: Initialize rcvar The rcvar (zfsprom_enable) must be initialized. Otherwise, rc(8) complains with the following message: /etc/rc: WARNING: $zfsprom_enable is not set properly - see rc.conf(5). --- sysutils/py-prometheus-zfs/Makefile | 2 +- sysutils/py-prometheus-zfs/files/zfsprom.in | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sysutils/py-prometheus-zfs/Makefile b/sysutils/py-prometheus-zfs/Makefile index 6885fafb7e0d..7af6eee556c5 100644 --- a/sysutils/py-prometheus-zfs/Makefile +++ b/sysutils/py-prometheus-zfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= prometheus-zfs DISTVERSIONPREFIX= v DISTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-prometheus-zfs/files/zfsprom.in b/sysutils/py-prometheus-zfs/files/zfsprom.in index b5636eea6344..f4e3fbfc2e49 100644 --- a/sysutils/py-prometheus-zfs/files/zfsprom.in +++ b/sysutils/py-prometheus-zfs/files/zfsprom.in @@ -21,6 +21,8 @@ rcvar="zfsprom_enable" load_rc_config "${name}" +: "${zfsprom_enable:=NO}" + pidfile="/var/run/${name}.pid" procname="%%PREFIX%%/sbin/zfsprom.py" command_interpreter="%%PYTHON_CMD%%"