From nobody Wed Feb 12 01:43:44 2025 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 4Yt1LS6N2fz5n80L; Wed, 12 Feb 2025 01:43:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1LS5qvpz3gq7; Wed, 12 Feb 2025 01:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324624; 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=b32eAcL+0HYMwoXr3vqXHp8D/mX+BMxS6Pv0I4FK7Jg=; b=JeLvCmOIohSZyA9oTn8EFcoBmexkIuzIVvAqj545ynpPr5p7zvdba7PIndQ3x7IwtS9+pz itZ4y0I7UPUs4XkvOq9v6J8rNXRg4FNjkXOpFQUThuxVpfQMw6GAIomavWDEtYW9RlT9Gi tVlX6mDmTWZq+InetFrrtLEyQgsiHEttlbV+pgtoXzogr4JChBuqvKJFQ0NArsF1OHrAyi 3Ig/yKHyC0UFfmV5VVZL2yOMowXlIlJ1jh2yk1Rf8fKCaaY2OrWfAk6fVWU7Ryhs/8Wp7e 6tpXfJyJ+2YWgiPuppfQ2fVWyLXLBUhAyhM7+dCTuHAzC2yq0H/GQasyTMxn8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324624; 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=b32eAcL+0HYMwoXr3vqXHp8D/mX+BMxS6Pv0I4FK7Jg=; b=G+m/s4E63XQb1lFNAJnCwvenboYKbPjIJy2goKFWSDcaXQfWeseaF+osyM1tT9cdRYtRs9 xyUdetwUpcRn8f8oT70ntW+8W7emaSVWTgr4M5TVWg5nbCMgF0UiX/fz3sk+LME7GIxoj8 nqimd0RRMuXH8DjhMLMnHczkIq+xBJ3Zy7vm0o64gfn6eSO3w7YbgP+o/M5uKZCJ2LWVb9 HgAbBG67i7EwPZAHRee1VJ1KHfEZvZFzDFRu4TZ4Ur98OIo7CNvSPg2J0xcp8umhiz/jZt uB0iU8/rxe3cCX56X8exoXLnHlSw6pMvCU7AdhvfQFp0Rx5yQu1B95ryvZr5Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324624; a=rsa-sha256; cv=none; b=oip3Ow0sbY79CV7X9iPZJRx3/jamjF1DGp97c/hNf2wkGD27eb3m9UECpz33oe6DMM19ve If4AicBoKn23RGXcJCipBzSPGN9GKV7gT2TR8mv2+7gsFkiaCZLQMR59R0vWMLoTSfLwOa 3826QenAfuWpJx3SNo1Qbxs9D9anBZ+nDIWtZkiwxAnxUOzHTfgj9442GKGjQ3Qm4xzDQq 1Or+HLMwEf3SsL+Jp/foaT331ykRRVQZA/YuaYsHOETJcml5IigE5Pg4Q6DofIU9K2Z/d9 +ufNOziMJmR4iwGojaTaCcxzV8B7iNnzYAu65lssJfdP7geKsnTf5vGcVtl7kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yt1LS5MQgzfXW; Wed, 12 Feb 2025 01:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1hiJd051613; Wed, 12 Feb 2025 01:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1hiJS051610; Wed, 12 Feb 2025 01:43:44 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:43:44 GMT Message-Id: <202502120143.51C1hiJS051610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: e58d9b71f37d - stable/14 - nanobsd: Always define the partition index 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e58d9b71f37dde1cd19bb0af3a4bf94938f4406d Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e58d9b71f37dde1cd19bb0af3a4bf94938f4406d commit e58d9b71f37dde1cd19bb0af3a4bf94938f4406d Author: Jose Luis Duran AuthorDate: 2025-02-04 14:07:00 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:32:12 +0000 nanobsd: Always define the partition index Print the desired partition index together with the starting LBA and the size. Otherwise, when only one code partition is desired, the configuration partition (/cfg) may not end up in the third slice, thus breaking the scripts that expect it there. This was the previous approach, changed in 587c054bea0f ("nanobsd: Use gpart and create code image before full disk image"). Fix it by printing the index as the last column to reduce the chances of breaking current overrides, and using it as the gpart index. PR: 262098 Reviewed by: imp Approved by: emaste (mentor) Fixes: 587c054bea0f ("nanobsd: Use gpart and create code image before full disk image") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47835 (cherry picked from commit dc4b36b96333f2ab05f3c454f0df2e0a0d4d451d) --- tools/tools/nanobsd/legacy.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index a45b447337b2..2f689212263e 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -64,31 +64,30 @@ calculate_partitioning ( ) ( } # First image partition start at second track - print $3, isl * cs - $3 + print $3, isl * cs - $3, 1 c = isl * cs; # Second image partition (if any) also starts offset one # track to keep them identical. if ($2 > 1) { - print $3 + c, isl * cs - $3 + print $3 + c, isl * cs - $3, 2 c += isl * cs; } # Config partition starts at cylinder boundary. - print c, csl * cs + print c, csl * cs, 3 c += csl * cs # Data partition (if any) starts at cylinder boundary. if ($7 > 0) { - print c, dsl * cs + print c, dsl * cs, 4 } else if ($7 < 0 && $1 > c) { - print c, $1 - c + print c, $1 - c, 4 } else if ($1 < c) { print "Disk space overcommitted by", \ c - $1, "sectors" > "/dev/stderr" exit 2 } - } ' > ${NANO_LOG}/_.partitioning ) @@ -174,7 +173,7 @@ create_diskimage ( ) ( } { # Make partition - print "gpart add -t freebsd -b ", $1, " -s ", $2, " $1" + print "gpart add -t freebsd -b ", $1, " -s ", $2, " -i ", $3, " $1" } END { # Force slice 1 to be marked active. This is necessary