From owner-dev-commits-src-all@freebsd.org Sun Mar 28 10:20:37 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 3EC6D5BC65D; Sun, 28 Mar 2021 10:20:37 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F7Wtr4HJsz4S3g; Sun, 28 Mar 2021 10:20:36 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1616926833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gW8T0ZkBVqmN5NUJfMZ3CeLnWlx2DqnLXSrs0WV4BYA=; b=YhGaRD66EjxeqrwxCEf0QUEp6uM3opUnRn2owOqOsRHPnbcZd9ZpVvlLZ+f3i798yfhw3M bl+zfEcY7v0nFJzs8RIKB5J0HcVX9RAEZmqt1MJFGb1x86eNywH7gmvYSMDI64qwWMGEZn rSvM/BGgxkEbIp7FyFpe8p1VRRtc3O8= Received: from amy (lfbn-idf2-1-644-4.w86-247.abo.wanadoo.fr [86.247.100.4]) by mx.blih.net (OpenSMTPD) with ESMTPSA id cab9e2ee (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 28 Mar 2021 10:20:33 +0000 (UTC) Date: Sun, 28 Mar 2021 12:20:33 +0200 From: Emmanuel Vadot To: Nathan Whitehorn Cc: Emmanuel Vadot , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 90d2f7c413f9 - main - release: amd64: Fix ISO/USB hybrid image Message-Id: <20210328122033.82df8633d58488186f706c05@bidouilliste.com> In-Reply-To: References: <202103271108.12RB8vdT074664@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4F7Wtr4HJsz4S3g X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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 10:20:37 -0000 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 ? > 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. > > > -- Emmanuel Vadot