From nobody Fri Jan 13 20:59:44 2023 X-Original-To: dev-commits-src-branches@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 4Ntv1Y082vz2pC3M; Fri, 13 Jan 2023 20:59:45 +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 4Ntv1X4tLPz3tbl; Fri, 13 Jan 2023 20:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673643584; 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=Pcy/Ivf6pynsgxCDWLL0lcbuXvT4BcE/OjNQsXNJ3SI=; b=AviycBm9hhKr9FnRPKbL++YjMXGqZIYoS6RqafiedutERxpdQOA1ux/s5NAKoILvXLzqQr AjffAo3RIBl6Q8w6UlGwcQ4LkvQQikxqfaKvHwx7ggZGp9dEULAh0kNnCn0ZVh1FcfpdA0 kb9ZzHgzyvwuvLWYiLzu7WScVCrJUWIGYMwnZEYZmSTW+Q1dAo0tSSjTY8iMQi3rsagnlu Nyr43SwSsmcAYfX+F5Fhr5rGWXkkKj/6H9rCbOk9M37U5ywaaz+m82ccgXGtM554M21XOY GyXGYEhZF74QJk445XWNE9o7m4lt1Uj3eI4KxFkWIVH/sFwDz4IsI5PnUFDOfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673643584; 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=Pcy/Ivf6pynsgxCDWLL0lcbuXvT4BcE/OjNQsXNJ3SI=; b=USMo95TDrYSB67sz1H9r7Zq4F20THXrsGeieywnm50ARS5qVGc/gsuD7ln52iR9YO9Ri7w 1Y2N57BmqI3ZyYQuY8vcFOWKChQuqKGtzMXqg1miNZ16u70NhylDl0O8xWXsQ4gBOAHysW +L8Hj9dsXhVEgJVK+6s0Wgva1HU8qgVkywR8oVVfbbSCFgn2VfGymGshFsi4FPnCeNpa1G Tc7iYEp34ZEPMyYYRWedTMh6v7s4UUiIYbg/p57iwgfMqOb0iLb9WbOmrCNfyGTSi2OcXt qMx2EzT5uPV6zvJfgBf8uhGRECER4c7PKfezmpgUPCdgW1MtuEGZ8PtF1HVeHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673643584; a=rsa-sha256; cv=none; b=bmr5oEj7kG+0Yz8+R6NKAXKzQMM1ZLZ1ufxTGwYzl+7+WDr7oCRIWOLg8TOEQNbu2TW/4n h+i3elw13hrJbLASEgr5tw2iguaFPWkpEztoXs2zLDIiY2u6Y0Dob6/B7108OPgqYvvagx J0nyEyDv3cCGuIDwmd3OW2ig8GVf92Rov6uFXyyAe6eiuNSzFmmMApYgucVKbdshWeg4L4 ttT0tipsOZZppBddFVHNgvrItR6NzxXIjhVORn16/Nzlv/zJ5lkWOyWSz4YiSeBFu4E/lL 7B7ES8o/be6cQLtEfH4RY2t3Lu3eHDENTgg4atvuvfh3fHsEEyjiebLhQJ28AQ== 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 4Ntv1X401TzM8l; Fri, 13 Jan 2023 20:59:44 +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 30DKxirG097157; Fri, 13 Jan 2023 20:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DKxioQ097156; Fri, 13 Jan 2023 20:59:44 GMT (envelope-from git) Date: Fri, 13 Jan 2023 20:59:44 GMT Message-Id: <202301132059.30DKxioQ097156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: a7fde0e0387d - stable/13 - growfs script: fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: a7fde0e0387d38f07d914e810a1dae12399ef053 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=a7fde0e0387d38f07d914e810a1dae12399ef053 commit a7fde0e0387d38f07d914e810a1dae12399ef053 Author: Mike Karels AuthorDate: 2022-12-26 14:45:17 +0000 Commit: Mike Karels CommitDate: 2023-01-13 19:15:51 +0000 growfs script: fixes Cannot use single quote in comment in awk script; add growfs_fstab to Makefile Fixes: 4a30d7bb373c,d670a8f7c596 (cherry picked from commit 4c8a257810a69264015e4912e02f8c2c837c792e) --- 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 0e7a04a5df1b..0c1106338378 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -36,6 +36,7 @@ CONFS= DAEMON \ geli2 \ 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