From nobody Mon Dec 26 14:51:16 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 4Ngghh65g5z26Vyn; Mon, 26 Dec 2022 14:51:16 +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 4Ngghh5YPtz4BKp; Mon, 26 Dec 2022 14:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672066276; 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=FpxXiPUUqW7tBz8b5Kyfy0ajQ0h4QrKRKwuylN6Q4YY=; b=pzjDiLUjc2J2enVFORfwg8d8j8U4XQtlEe7jIyqz+IVwkSAjTA/FLzlK65xie6yGDFy1XU xf8YhLqrzKssssI8iTT6SYqy4Z+oLwsCaKZercLQRyPJTemEGZLmh4pKILmqRSm4UgxGeD DY1WSXTaLqNtQjmX6EFlDfZS2pOSiZtT3i/3NXfge4dVpZVgsFRS6sGjv1t/K5adTZi0ud 8rWnbeXwBIyQADWa3aerqwmnPlDvAWFTs54QzHuTOjGSej1ugkJcUZul+i31/HF/3wcjOk dBqIFyHoFpUp/Q5bW+vn6m551mvTOT7SR8gFJbYy+L+UNfEj9opg4gMv2ilPnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672066276; 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=FpxXiPUUqW7tBz8b5Kyfy0ajQ0h4QrKRKwuylN6Q4YY=; b=dKWchpbQZ5hkL1NzQHH4pItwcrX1ZIuml6Bib0YPIktWfv8UPTEsNn9w0C7rAmOCMYQcFO 6SqGzR60XDG9eeyyRii9E29KI7K1IpS1tw77/9sk8ODWfpZ7Srebm1HwTaqbcEr7h62j9x FvzAGGLBHuaFTOt7eWmwzuAUh55+6IiVcU2qamdM+lP+Jfy27lrGuR8Dbua54Ff7aSDiCH KhNHpTW7pMCEnrZKzDmDzrO77xHcv52qutGsOSMRqHp2M+aCzMGRSPWQqo71HU2vM9DYrM V+x0UcmiAijie4iqYrJlL7bMuWZ28Kw/xNHcXi0vx9Pst/nQFLNI3mBNp1VXXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672066276; a=rsa-sha256; cv=none; b=A5cpjcMaKcUyFWjbQzrZniJJEK1bncQYLW0Z+5n24qT410XdxqhtHg527Nbyt+t2FQuPyJ MPKpX9So/Sni6Ne8IO57lns2RfCUidamDA0MzbwmsWabpKV8yQstzYAqlGrwZHffi2QoSp 9pEeHraL0evV5jlJwKuGS5MlOGcmdYvTW0iwhikpBksIAH2szRQ4R3n4fBiuWQ4hL8NVmN KnaiZ8ifacqOk++Psov/TLHvaNapMleKf6kCPtEbuh0Qbj6MOcIisf+HGCTEZaDPjERbUg tVfGwfnBgP7hNujH9Ep0XvIiNvnKJwkJzhxc7q9FCh2G1B07wV/sxFxvwBeupA== 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 4Ngghh4cNQzZd3; Mon, 26 Dec 2022 14:51:16 +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 2BQEpGfp037973; Mon, 26 Dec 2022 14:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BQEpGhP037972; Mon, 26 Dec 2022 14:51:16 GMT (envelope-from git) Date: Mon, 26 Dec 2022 14:51:16 GMT Message-Id: <202212261451.2BQEpGhP037972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 4c8a257810a6 - main - growfs script: fixes 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c8a257810a69264015e4912e02f8c2c837c792e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=4c8a257810a69264015e4912e02f8c2c837c792e commit 4c8a257810a69264015e4912e02f8c2c837c792e Author: Mike Karels AuthorDate: 2022-12-26 14:45:17 +0000 Commit: Mike Karels CommitDate: 2022-12-26 14:51:09 +0000 growfs script: fixes Cannot use single quote in comment in awk script; add growfs_fstab to Makefile Fixes: 4a30d7bb373c,d670a8f7c596 --- libexec/rc/rc.d/Makefile | 1 + libexec/rc/rc.d/growfs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index e990dea60721..703668ef4dd5 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -35,6 +35,7 @@ CONFS= DAEMON \ ggated \ gptboot \ growfs \ + growfs_fstab \ hostid \ hostid_save \ hostname \ diff --git a/libexec/rc/rc.d/growfs b/libexec/rc/rc.d/growfs index 3c48a7dca6b2..3c738e24177e 100755 --- a/libexec/rc/rc.d/growfs +++ b/libexec/rc/rc.d/growfs @@ -200,7 +200,7 @@ growfs_start() disksize = size[lvl] if (verbose) print "disksize ", disksize - # Don't add swap on disks under 15 GB (decimal) by default. + # Do not add swap on disks under 15 GB (decimal) by default. if (addswap == 1 && (size[lvl] > 15000000000 || swapsize > 0)) doing_swap = 1 else