From nobody Fri Jan 13 20:59:45 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 4Ntv1Z0QV8z2pBsW; Fri, 13 Jan 2023 20:59:46 +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 4Ntv1Y6Q9xz3tkK; Fri, 13 Jan 2023 20:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673643585; 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=21MMG6vgGw51jgfq5xFwB9qUvS+LIHWuPdotlsdCb9o=; b=abVVMbsC1JobRvH0K8Kx3zi1FSQlvQ8nVvzilhGjnF2wK5vA/ife7BNskLiCzOD/QVGx58 A9Xu6Ds1OE0hnrFoAH1hZBIHY4b9mCgV+t7gc9QAUE07wa3bBebplaHH77rqOkKMJ8cApH IGAHVGFWd10esXKOAf8EFUssuVh895soWOHC2pOrpdyrYMWb5pWV0Zm2PBXuMTby8da+Fo LdtqJkNglaXtjS8mTi6L13/8017dz7DXAH3s1MNhWLddo8GV1uF8e5wticllZu3+rbDixF tROCodjoPGFxvXTk+8uxMlJMPlXWGzV1UPLAaOrCb57XPOf3DMnNqUBQM946uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673643585; 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=21MMG6vgGw51jgfq5xFwB9qUvS+LIHWuPdotlsdCb9o=; b=VUV18KDb2eBcERtK9obPiWiWD9tchYxFN5rxseUowEJGfINKr/bnuUPRB07Lsv7Zlidy2G d5Qi2OEBI/Yi07BhL2dOVOuK1tagO0TQ3vqrLFoux2M3FaAUFtl9imuW8Su7cq9dVxGIO/ POZo059Kb3OZDG82WhFmf+ZLEwL6QSb8wHs9nZ8DlqVovhiZ6JjGm7zPF2VS0um79U9BeK W++DgTe0gKdDG4jyRSrgJB/bHC3/QC5HCQ1H5lwQiDYtxDA+kGYcxFETS/fnMUR9IlFPgl lLn/gU5R9vcBtJONwjY4njMek0eXOCqoJ56Je2Z+GOLrHphS28nteLTxkl3WZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673643585; a=rsa-sha256; cv=none; b=jmQ3eSNRmYKhJ4Sm/rANui6lVlobgIM5SZMl9H01X1JQhmBdtxm/K0xCs5TeiRVN/beFXJ KqRWcgBr1NhKDJ5WyI37Ty5CuD0xcGHshpxBl2fFd1cFrcKAHj08UomnlFt5du1D1Gh69m Y0CIlG8VLksaM0l0AHjM8rvm/+cHk4Sn17asZJ2zb1LJtDsX1tyQTAR0VdV1XZG5TTkPep XQVPgARfiOwUJgA8gdvOznYVLt87ZZq39pJw4Q1di5VTlglw0IM84fnk0ExHp9lw4ZovHs KMgpF0FanC7kUydJ0fyIZPvj2TH8nQOiTg84CTtwqtCB08WNbMjK3GB7JEf5jQ== 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 4Ntv1Y5BXtzMbg; Fri, 13 Jan 2023 20:59:45 +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 30DKxjE6097181; Fri, 13 Jan 2023 20:59:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DKxjsZ097180; Fri, 13 Jan 2023 20:59:45 GMT (envelope-from git) Date: Fri, 13 Jan 2023 20:59:45 GMT Message-Id: <202301132059.30DKxjsZ097180@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: 8a16a2cb0978 - stable/13 - growfs script: fix config-dependent errors 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: 8a16a2cb09787edd6910d56112ff0aadfc387258 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=8a16a2cb09787edd6910d56112ff0aadfc387258 commit 8a16a2cb09787edd6910d56112ff0aadfc387258 Author: Mike Karels AuthorDate: 2023-01-04 18:25:54 +0000 Commit: Mike Karels CommitDate: 2023-01-13 19:15:54 +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 (cherry picked from commit 0e2fdab227a1e02956271e5a15403d1408de1eed) --- 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")