From nobody Fri Apr 14 12:52:59 2023 X-Original-To: dev-commits-src-branches@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 4Pybvv5QvVz45Bck; Fri, 14 Apr 2023 12:52:59 +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 4Pybvv2sBjz3s1q; Fri, 14 Apr 2023 12:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476779; 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=ECXQAiqCN1OXy8bP07TcrlBH2+IoJTgQ1wbon08wUbM=; b=oFghwHLBxsFXzuJg6Vhb+TbQMbv6HHIIcap2dPPnEf3aC6OWrqutTpjEJ0FKLOtpEYRusT 1n9ebmgNLzTaN/AxDcECDP43p3I2dE1vbAjyRFFtXJLJYTSufPHxvCkymvXRLlTCigLOq+ WFRrd5j3ExvH8FyPj4Ij5Beu/rnLRHl007btXELsK/N20dUOngODKR5MPBv0srqsZMEB0R KphMGpZi5/RZOLKqP7ASnrJCxbwzwsQcp/esb7wZDi4EQiK3V2D+bgT/QePHC7aO4qO632 uX2/dMq1PM2qaEYVyZ71q34X1wzPtOTpXLoRHqsUuB+ug1p/hch62/WUOZ+IhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476779; 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=ECXQAiqCN1OXy8bP07TcrlBH2+IoJTgQ1wbon08wUbM=; b=SymcM360ZIyQHqEoXFRXgnpiY2IwLKjLbTHhv/okuH/YeP8XP/As5u5Er4xIPw41azKtMF bBD3u02NSQ5RNVT5cWVFA5dZBLCBiCkJ8UPPGj5aMkfp29zKHHWCNejwl+hAW5JevDMqmM bf5qmy4lDliQe2fSpu0Sox2nC/rpQzaFclonn9lnDxeI4qc5B76/Z+LrqgfX3hyWvckBRs uM381QdAo26xUO1/U3H9/wqu/LRyQivjtd8zRqPIruf2xiprJ2ztRbnnyJnhKwjTwE9WX8 YtSra8Q6Dr96XletgFpf/KcsluBofxizu4N0J1K242VuoCei25cLU+t+Sk0/wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476779; a=rsa-sha256; cv=none; b=j76A90k6znFTznXRPpoq+FRfDbXkN3mBEHNeo1NW3it9//MFO5DnV0SozPCs1n98y8zDRu ZK1B3WebYhR+QMvjp91wslgNCmQ2FK91VfxmkqbVSnAOF0eZ4Oec1OkWgoj73aWRdQs43O szm1xZ2Y8c7l6hShipvpmdPsP505xMBRqgSoTgOEnvzD2gnVQRJz1Tkbx4keaPYir69mWZ oZgWexPVqyztQ9At0uo/ntSE/6XF9BigQqQPJt/VQM+JO0sOad7ONxdMQtpRcMHYf5+hAB 6YB9Tg9jRATmPITpXsjVpXUjunYXJivQuu/aW6VZs7xxyGKQMFXMnewpNJsr6Q== 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 4Pybvv1y9FzPgX; Fri, 14 Apr 2023 12:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ECqxYC074932; Fri, 14 Apr 2023 12:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECqxNa074931; Fri, 14 Apr 2023 12:52:59 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:52:59 GMT Message-Id: <202304141252.33ECqxNa074931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 496478c1dcb1 - stable/13 - makefs: set the validation entry system type List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 496478c1dcb1303edbaaa955261d4089af80f58b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=496478c1dcb1303edbaaa955261d4089af80f58b commit 496478c1dcb1303edbaaa955261d4089af80f58b Author: Ed Maste AuthorDate: 2023-03-30 14:31:45 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:38 +0000 makefs: set the validation entry system type Obtained from: NetBSD c3cb4dcc9c43 Sponsored by: The FreeBSD Foundation (cherry picked from commit 22db5e5d03278471c46799016c177abf95f273cb) --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index 6d7a32378b64..f837c0b3c381 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -374,6 +374,7 @@ cd9660_setup_boot(iso9660_disk *diskStructure, int first_sector) struct boot_catalog_entry *x86_head, *mac_head, *ppc_head, *efi_head, *valid_entry, *default_entry, *temp, *head, **headp, *next; struct cd9660_boot_image *tmp_disk; + uint8_t system; headp = NULL; x86_head = mac_head = ppc_head = efi_head = NULL; @@ -388,9 +389,16 @@ cd9660_setup_boot(iso9660_disk *diskStructure, int first_sector) cd9660_731(first_sector, diskStructure->boot_descriptor->boot_catalog_pointer); + /* + * Use system type of default image for validation entry. Fallback to + * X86 system type if not found. + */ + system = default_boot_image != NULL ? default_boot_image->system : + ET_SYS_X86; + /* Step 1: Generate boot catalog */ /* Step 1a: Validation entry */ - valid_entry = cd9660_boot_setup_validation_entry(ET_SYS_X86); + valid_entry = cd9660_boot_setup_validation_entry(system); if (valid_entry == NULL) return -1;