From nobody Tue Apr 23 21:43:26 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 4VPFwv0bh8z5J81c; Tue, 23 Apr 2024 21:43:27 +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 4VPFwt5zkYz4vR4; Tue, 23 Apr 2024 21:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908606; 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=PLGhiVlITbbxMh04DJY2Bp71GBDcO6grv5CBL5eAnkY=; b=CAEbbLPh2BbzQuK/6bju6FcOZA6oo2+P71gmLcN83y7Lioe4A2onu/MiPUUFrwp8iy4qMm VqIrwnMkzNaA7UYN9YMuFiQaTFft+mAJF3sOhVhF0dFz/ib3XkTlezY6TY8VbfqVF9DaOR lS0IPbeoqv9gDRBvM6L16uO4SQVz/C6YQ6tFZxLY29v7M/ITYZ4selqnLMk5YhTpiQpBhc Vqp6ZcHwuhSoVIsPZ3o9jTULfT31J4bnlywles8NF8kQKroG+kj/hzSPwq3D5fezIrysAr YT/MQplhy5Pra8BaJCkIFhev5QO9EnzrKZIGCljiM+24osghztx4Q3zY30L70w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713908606; a=rsa-sha256; cv=none; b=IyYphtlKmxf31Vj7gFihio4Oeiqk90vkvVtXczxn5AnzoyfT2ODI6avDVUnZsLgV73+tKG IlLSrRY2au/eOMiiWVbrydhfPw0/CJP+aWQyAFEmeHCtRdQIdmK8FWVR5fkkr8Yb5wYoFH yLtMsHsjwnmJqM2ix+fNe9f1lI4/aghAzi+KTP/ckoQDzT+1DLznf/afqu3P+yKqia4SyK 67JkyIFgOBX6XZLu+yUdHTdOXHAKBdhg5NpagbhAykqBF2Gftk+OAM3w9ea6TIK3vJaic5 EJFSFhELwuXuFOKE4cmEczXYRpYS3s1rlTpNluSXz3ZZhsJhwypDqC/9wlMgQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908606; 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=PLGhiVlITbbxMh04DJY2Bp71GBDcO6grv5CBL5eAnkY=; b=XSubsEP1ZYdt6ufEw+Th2/VBQrtuAfvcbGInkQHoOT1tAQtfBLEYVEnnB/q3D0VPZOZnGv YFf1q5m/0+iYp/qhmGn5CiZIIl9bNYVh008zDGqvLfpzkqekoNJXwdDTbvmyQvREIMyfiY 2b+szwaZOhQpuI0jzA54HjjnZPHVL7KJAEk5ETOVJ3DQINYZ0GAqB70vsVfNZ/JZRh1gJz tjcM7PcA//79/p4d3Qp1g2B1n5Gf3nDaBPhmhkkc3z5Jm6HoHSryVHzFupxSE8p9RPOtsM YxPYQQNdxAJdg3bo7Dw+FVJVNj+NkTSCbbqqHeGGTX1n5Em0liL0+yC3eqD97w== 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 4VPFwt5cHNzpSK; Tue, 23 Apr 2024 21:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NLhQ7o080118; Tue, 23 Apr 2024 21:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLhQNB080115; Tue, 23 Apr 2024 21:43:26 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:43:26 GMT Message-Id: <202404232143.43NLhQNB080115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 14e3f2d8d3eb - main - nanobsd: Set a GPT label for EFI and cfg partitions 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14e3f2d8d3eb6f47556e59bee3e2004ac9a9d7e6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=14e3f2d8d3eb6f47556e59bee3e2004ac9a9d7e6 commit 14e3f2d8d3eb6f47556e59bee3e2004ac9a9d7e6 Author: Jose Luis Duran AuthorDate: 2024-04-23 21:12:45 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:13:35 +0000 nanobsd: Set a GPT label for EFI and cfg partitions Use efiboot0 for the EFI partition, the nomenclature efiboot + #index was taken from bsdinstall (zfsboot). Use cfg for the cfg partition. Poudriere firmware images are already using this label. PR: 278480 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1187 --- tools/tools/nanobsd/embedded/common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 17caef798af2..bcb1061df629 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -293,9 +293,9 @@ create_diskimage_mbr ( ) ( # p1 is boot for uefi, p2 is boot for gpt, p3 is cfg, p4 is / # and p5 is alt-root (after resize) mkimg -a 2 ${fmtarg} ${bootmbr} -s gpt \ - -p efi:=${NANO_WORLDDIR}/boot/efiboot.img \ + -p efi/efiboot0:=${NANO_WORLDDIR}/boot/efiboot.img \ -p freebsd-boot:=${NANO_WORLDDIR}/boot/gptboot \ - -p ${p3}:=${NANO_LOG}/_.p3 \ + -p ${p3}/cfg:=${NANO_LOG}/_.p3 \ -p ${p4}:=${NANO_LOG}/_.p4 \ -o ${out} ;;