From nobody Sat Dec 21 17:06:03 2024 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 4YFrK83Jn2z5hPnV; Sat, 21 Dec 2024 17:06:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YFrK814Lrz4PZS; Sat, 21 Dec 2024 17:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734800764; 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=taZW+Qwd73GHflGWtu+xN6zI50kc1WUGRlXBmRcrB4o=; b=jCHBeRJrDs8k8u+6l+a0i3cuY8Ng49rfBskupz4OOc0eFe50BfneIuW7kyG9xPPixv0KM2 s0tijtuC5ludMWMsdRmr3SUPsQJzlSW/eGoLDhoKHnm/fLOjpMM/btSViYqcz77SmFmLmT qVHF3TX3PVs7p9MZmAUWtv8RxGn4D88spEj7egfN+BUEsog70XrdDncBDhAmVkGkTZjnkw w+K3yOG5XBedvTbAv9wYf1PGe2BRhGpeCcqjc8aSVjv+YviIcefm4MzWBQ1shkKvlz5h/C xNa+OYN1vaGAapEob2qSXmxgWaJaXW4K4kPUTyQMjExYi1ivBNtDomLh+3D7Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734800764; 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=taZW+Qwd73GHflGWtu+xN6zI50kc1WUGRlXBmRcrB4o=; b=IEHZeuHg+cJs4Pyl3oSyc/MY/HQJAkFCAVDp4k/GxLTXy9ewQyAZEWF/6wB0hZWdcaUah7 EGPjEgya7KcObhsbeuqZyOW2Omcu71oMiwO07zMGl5HRfI+3n3ABcvAeStS8htIixJ2J2A KW3NL3XCKd2KZvEzv2dO4d8AVnxhvMhLAuEUCnWK1vyCQJiaf4QWWF5KmeUbIabALGtA5F Ox38SXKqcjpjXDX2QX7quxej64lKxOAw1aXZQG7JxlyGRgxJ9gvMbi8DJm5imeTTTh+OIK VEl9F2cVRM4nE/kXMG1m+MHvA0Z5E7pKrBUlRc6BCEoTKOGfIRgwFOt2vT1Ogg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734800764; a=rsa-sha256; cv=none; b=tBUls9YjEqonx6Xkk0au8lLP7DXLgEDpPfZ/Y+k3xED8aVq7I3C1M7uLDJVCWE8mU+e49b Cgw3TRSc4PCVJeoT3r38xE7FPHa/PZ6U50v/UainKilhrUsGSLAa4TRWvuvo8YhLD41ntD fum+BuISUd1zEzoigpO7AjnMJttauDhWPOoq/c7o8sDrZqPXkIcE8v3x34ppBzfFJPTRnm vu7cCZAF1b7NKQ7l2BGbd967lnFJH9X+Co3Wdei7jytrQxGvSloHAvhZuw1sYI6iaQmCNC kit+DreMxHKiN1cIuOluSwigaKuWmDh2gdSvQlFvb7SP4eqsYwJ2yMFgYlDphA== 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 4YFrK76x2tzYMd; Sat, 21 Dec 2024 17:06:03 +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 4BLH63Zn071201; Sat, 21 Dec 2024 17:06:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BLH63Fe071198; Sat, 21 Dec 2024 17:06:03 GMT (envelope-from git) Date: Sat, 21 Dec 2024 17:06:03 GMT Message-Id: <202412211706.4BLH63Fe071198@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: 0520d2ea9dd3 - stable/14 - nanobsd: Remove dependency on bsdlabel 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: 0520d2ea9dd37fc968f02e615b53bfe4521af789 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=0520d2ea9dd37fc968f02e615b53bfe4521af789 commit 0520d2ea9dd37fc968f02e615b53bfe4521af789 Author: Jose Luis Duran AuthorDate: 2024-11-18 00:16:50 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-21 17:04:24 +0000 nanobsd: Remove dependency on bsdlabel The bsdlabel utility is deprecated, gpart should be used instead: - Offset the first 16 sectors, just like bsdlabel did (used for metadata) - Use a freebsd-ufs partition type (regardless bsdlabel creating a '!0') Reviewed by: emaste, imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47653 (cherry picked from commit 87e87fecb139d60a00837f004de0d37dbecd205c) --- tools/tools/nanobsd/legacy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index 58288d063b4a..a45b447337b2 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -116,14 +116,15 @@ create_code_slice ( ) ( trap "echo 'Running exit trap code' ; df -i ${MNT} ; umount ${MNT} || true ; mdconfig -d -u $MD" 1 2 15 EXIT - bsdlabel -w ${MD} + gpart create -s bsd "${MD}" + gpart add -t freebsd-ufs -b 16 "${MD}" if [ -f ${NANO_WORLDDIR}/boot/boot ]; then echo "Making bootable partition" gpart bootcode -b ${NANO_WORLDDIR}/boot/boot ${MD} else echo "Partition will not be bootable" fi - bsdlabel ${MD} + gpart list ${MD} # Create first image populate_slice /dev/${MD}${NANO_PARTITION_ROOT} ${NANO_WORLDDIR} ${MNT} "${NANO_ROOT}"