From nobody Wed Jan 04 20:05:48 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 4NnLFS6846z2nyb8; Wed, 4 Jan 2023 20:05:48 +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 4NnLFS5df4z4NnX; Wed, 4 Jan 2023 20:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672862748; 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=mtQuoa8+v76f1lXnJ3+7Jc4kewip4x3g66VldCcFUzY=; b=fWRxCyQYB9j+oRWfCRbVhfjBItCxS8rGCr2bHdSVqKpM1qS/Q+7z970Gs0SDVKTxD4berJ owxdWBG6SkEpc2GT2ZlauuXgmaj6fULZ+NLPJRBW20qjwKVVXeTdu0ROpEBnKscueJa7aa ll3CnVXln5qM04t6MTMp9nFNfQW5ksW+Byue/+dhtjnSOf6HQa2KmJL3gU9lU1Kx6ki76k +fi84RVREbuWJVlYyzGCKDVjGaRZiBqeKA1lpkdp+3xFeXSgG0mHui+LPXYTrSBv3qrXGO Zx33cQPb/HFICv+E6/g92HuYMJq8xCeXEcFimyd9kNZ+xiyc4+fyNCn8f75e6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672862748; 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=mtQuoa8+v76f1lXnJ3+7Jc4kewip4x3g66VldCcFUzY=; b=p96sU7vXdZbIOYM3unR1PbXxV8M4iWVnFadOVwjGiQERsxJQ3i0bbC9qSD83Z15klo1Vtu NGZV9HpOpYHAFO5p+b6Iiv4vfZqSIKWh0sz2VE5e8NSypGaRtLQgP01LvYwx7tXSN7oHhw 9yfOASPF3QWLI4RoPZ//lcRkCJTZwKhYaVI8ArItgG0JSkWKaJyokoXk1zM/VLcfrpJy5j hjZ9zjhSC21Coa/PbwZhWZe2IPSsEjsh/C1WRQLXweR4Q1SG+3MCG7cy0+ASbq3cHuETJP mtyiL6L6d3v3CxkxkAMwKzzxRdybgPgZp1N9MUr4btycq3uB5lnAw1xKfVxmYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672862748; a=rsa-sha256; cv=none; b=GeD+k5dGurw2lLm/uojvDvF92AB9W4GYROnBXeXUbYG66JshNgZl9bfKNuVURUzaEArCqt kVLxYbo9vkU3e0KfwzFMu5nvybdPc+e94M+uhMBVSM51cmDLWDtIEpwJjU0qQwejHCJplo x/tqmqOOmAS2OWVQnHkwW6+tGeZUk1hr6SLcwkPYA9NTMVPdB05nGD6TwMetvdh3n4qYpF HfJsKuaO+0cO0F56wCSL2FiOK+XREFcgnKjhnxC1pNx5oG48+0MejIHSATBqVskpfVSXYY DVc5Zs+zXlQJjDVvEbA+yy8snISkCjk6PrGYMAGL9mQ664wJ7MRyf5qO3rTGBg== 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 4NnLFS4j15zNvn; Wed, 4 Jan 2023 20:05: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 304K5mQA059532; Wed, 4 Jan 2023 20:05:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 304K5mAU059531; Wed, 4 Jan 2023 20:05:48 GMT (envelope-from git) Date: Wed, 4 Jan 2023 20:05:48 GMT Message-Id: <202301042005.304K5mAU059531@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: 0e2fdab227a1 - main - growfs script: fix config-dependent errors 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e2fdab227a1e02956271e5a15403d1408de1eed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=0e2fdab227a1e02956271e5a15403d1408de1eed commit 0e2fdab227a1e02956271e5a15403d1408de1eed Author: Mike Karels AuthorDate: 2023-01-04 18:25:54 +0000 Commit: Mike Karels CommitDate: 2023-01-04 20:05:35 +0000 growfs script: fix config-dependent errors - awk sometimes formatted swapbase as floating point, which gpart does not accept; force int. - Fix typo in code for checking vm.max_swap_pages. - While here, do not set kernel env if "gpart add" fails. - Add "gpart show" before modification to verbose output. Reported by: marklmi at yahoo dot com Tested by: marklmi at yahoo dot com --- libexec/rc/rc.d/growfs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/growfs b/libexec/rc/rc.d/growfs index 3c738e24177e..4cd4f19c8eac 100755 --- a/libexec/rc/rc.d/growfs +++ b/libexec/rc/rc.d/growfs @@ -89,7 +89,7 @@ growfs_swap_max() if [ $swapmax -gt $vm_swap_max ] then - $swapmax=$vm_swap_max + swapmax=$vm_swap_max fi echo -n "$swapmax" } @@ -260,9 +260,9 @@ growfs_start() " sz ", size[i] swapbase = (expand + size[i]) / sector swapbase -= swapsize + align - swapcmd = "gpart add -t freebsd-swap -a " align " -b " swapbase " " pdev "; kenv growfs_swap_pdev=" pdev " >/dev/null; " + swapcmd = "gpart add -t freebsd-swap -a " align " -b " int(swapbase) " " pdev " && kenv growfs_swap_pdev=" pdev " >/dev/null; " if (verbose) - swapcmd = "set -x; " swapcmd + swapcmd = "set -x; gpart show; " swapcmd } cmd[i] = swapcmd "gpart resize -i " idx[i] " " pdev if (parttype[i] == "GPT")