From owner-dev-commits-src-all@freebsd.org Sun Mar 28 17:58:41 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0D17C5A8CEB; Sun, 28 Mar 2021 17:58:41 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F7k3N70fYz4tqf; Sun, 28 Mar 2021 17:58:40 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from comporellon.tachypleus.net (unknown [IPv6:2601:405:4a00:acd:d44e:ca04:1a4a:e1a3]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: nwhitehorn/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id AC11E207D9; Sun, 28 Mar 2021 17:58:40 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Subject: Re: git: 90d2f7c413f9 - main - release: amd64: Fix ISO/USB hybrid image To: Emmanuel Vadot Cc: Emmanuel Vadot , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202103271108.12RB8vdT074664@gitrepo.freebsd.org> <20210328122033.82df8633d58488186f706c05@bidouilliste.com> From: Nathan Whitehorn Message-ID: Date: Sun, 28 Mar 2021 13:58:39 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210328122033.82df8633d58488186f706c05@bidouilliste.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2021 17:58:41 -0000 On 3/28/21 6:20 AM, Emmanuel Vadot wrote: > On Sat, 27 Mar 2021 21:21:43 -0400 > Nathan Whitehorn wrote: > >> Is there a reason this can't use makefs's boot-image support directly in >> future, like hybrid systems on other architectures? It already supports >> all the complex interleaving of partition tables with ISO9660 for other >> schemes (e.g. MBR and APM) and could probably be extended without much >> trouble for this. >> >> (I realize this isn't useful for 13.0) >> -Nathan > I have no idea what the bootimage thing in makefs can do, can it > create a gpt disk ? I can't right now, only MBR and APM. But it doesn't look like it would require a ton of work to teach it GPT, and it might be more reliable in the long term. -Nathan > >> On 3/27/21 7:08 AM, Emmanuel Vadot wrote: >>> The branch main has been updated by manu: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=90d2f7c413f9fc4ac479fa5e91ba1de6d4ea8d45 >>> >>> commit 90d2f7c413f9fc4ac479fa5e91ba1de6d4ea8d45 >>> Author: Emmanuel Vadot >>> AuthorDate: 2021-03-27 11:04:51 +0000 >>> Commit: Emmanuel Vadot >>> CommitDate: 2021-03-27 11:04:51 +0000 >>> >>> release: amd64: Fix ISO/USB hybrid image >>> >>> Recent mkimg changes forces to have partitions given in explicit order. >>> This is so we can have the first partition starting at a specific offset >>> and the next ones starting after without having to specify an offset. >>> Switch the partition in the mkisoimage.sh script so the first one created >>> is the isoboot one. >>> >>> PR: 254490 >>> Reported by: Michael Dexter >> Tested by: Vincent Milum Jr >>> MFC after: Right now >>> --- >>> release/amd64/mkisoimages.sh | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh >>> index 1a1440fa1983..a9e8a2c04392 100644 >>> --- a/release/amd64/mkisoimages.sh >>> +++ b/release/amd64/mkisoimages.sh >>> @@ -89,8 +89,8 @@ if [ "$bootable" != "" ]; then >>> $MKIMG -s gpt \ >>> --capacity $imgsize \ >>> -b "$BASEBITSDIR/boot/pmbr" \ >>> - $espparam \ >>> -p freebsd-boot:="$BASEBITSDIR/boot/isoboot" \ >>> + $espparam \ >>> -o hybrid.img >>> >>> # Drop the PMBR, GPT, and boot code into the System Area of the ISO. >>> >