From nobody Fri Jan 27 10:31:10 2023 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 4P3DPq0RWzz3bHXP; Fri, 27 Jan 2023 10:31:11 +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 4P3DPq00vvz44vK; Fri, 27 Jan 2023 10:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674815471; 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=cxqxHrsaA3qNYYdqIJjrFmaC3kXURj9ua2UZiHxRGKI=; b=WZZkCS27anuhm4Rl8w/h9AyyED57kg2l6v+xSm1eIXnsOTIxU5nm40PAyiMalz/ytvBHLq s1creEUKZRnrsKq52wkGXalR2eI5yAXwgaha6m0BJ7kbA0l8mPzFSeEqoq0eZEbG836IV6 Ptj3viRgECIa8DZIUqvZWo+1wkwyXZUbWxBeC0ZuoY1nRGRPcN/25p+8raS2EUAIu0StN5 Gnop0GMlVLNOmyTWzPjT1DTiphcqvrMCfm61/Tu8KeVtxwSWgFbr/NL9Ab7z8DzTExX2tb hBPofQqHjVzBYZ8zkhn3sw3aBjjS6f18IStH5tkuT2uS23Lyv4RyUAS9lPRDvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674815471; 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=cxqxHrsaA3qNYYdqIJjrFmaC3kXURj9ua2UZiHxRGKI=; b=w68ReiTVzx6wmHRvhEsx/vjoqvirvGol8atv7exTsnEqZ0D8v4a3fZAaQjOl+eP9kPpcvT bigAqM5Z2/7WFmbP/4fPXo0wanS4eM4dcw6Ezp8CYz1CWHzUeg/W+oDuR0rCvtyJxCR5OP ld4QOKf2sUT7SS/DykODCQygWNBJ7KKAaZ7GO2fnihhoViVqLRhRY9vpyK/IAoL7Yg7VuZ yX+l273P6r8cQZMjkBnXu+Gqb6VvQHOlqNEzrBxa4db+L4t062Dw+F6e2zwwpp1gaVjnLc O3l7udSNhf/mvztv0SZbnlrRNkerPxqqqtY8QdJQSPNGiHMgOdYl9dZIhIXIDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674815471; a=rsa-sha256; cv=none; b=DHLc68SysdtZMyniN9nf04K1lNOpFaIFxjIG/2KpTKBtYDnxeDo/m1wEWtS7eHJa+nHP08 d66gI0iUJCdegQD8ikb/lC696nzLpTYFjAn7FFi22tgqPUJM1WIuwT6KJYoEpe5JJ/pgBn q6m3Z6Tv3LSCT/G5zC4LRwHYcts5iRzjf+U98+6BJsJpYHNfPMZ8l+ov4YAxZ3hvkQRsqy v//w2zVWkkU8KYzAklqynnVerIu8nUTKuXk8D/WmemPh4uXxkkGufAmKuzIPdPPrCb+VVK 50VmuEU/hb5cInXGoDcHFgfTrEfid/GfnkOMFdSbpYbX8tg6bYcu5ymjJrw1uw== 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 4P3DPp6Bywz15CQ; Fri, 27 Jan 2023 10:31:10 +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 30RAVAow071922; Fri, 27 Jan 2023 10:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30RAVAt3071921; Fri, 27 Jan 2023 10:31:10 GMT (envelope-from git) Date: Fri, 27 Jan 2023 10:31:10 GMT Message-Id: <202301271031.30RAVAt3071921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: cc9b2b58e2c5 - main - Revert "rc.d: Put growfs script in FreeBSD-ufs" 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc9b2b58e2c5fa3a1a21e741155daf1609e53773 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=cc9b2b58e2c5fa3a1a21e741155daf1609e53773 commit cc9b2b58e2c5fa3a1a21e741155daf1609e53773 Author: Emmanuel Vadot AuthorDate: 2023-01-27 10:30:24 +0000 Commit: Emmanuel Vadot CommitDate: 2023-01-27 10:30:24 +0000 Revert "rc.d: Put growfs script in FreeBSD-ufs" The growfs script also support zfs. This reverts commit 36a7fa1e16a0b4446f2cb618fc84a6bc1a2cbf86. Reported by: emaste, Mina Galić --- libexec/rc/rc.d/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index ff966eb17349..56ee41a8316d 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -30,6 +30,8 @@ CONFS= DAEMON \ geli \ geli2 \ gptboot \ + growfs \ + growfs_fstab \ hostid \ hostid_save \ hostname \ @@ -125,10 +127,6 @@ CONFGROUPS+= GGATED GGATED= ggated GGATEDPACKAGE= ggate -CONFGROUPS+= GROWFS -GROWFS= growfs growfs_fstab -GROWFSPACKAGE= ufs - CONFGROUPS+= RESOLVCONF RESOLVCONF= resolv RESOLVCONFPACKAGE= resolvconf