From nobody Tue Aug 15 13:44:48 2023 X-Original-To: dev-commits-src-main@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 4RQCDw5qbDz4mR1P; Tue, 15 Aug 2023 13:44:48 +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 4RQCDw4ztDz4Gg5; Tue, 15 Aug 2023 13:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692107088; 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=0joZBK3Kckvv1ObCp8aodtnYC1REGiSaeD2fH79R3vc=; b=wVDFPWFTCJ/+W5yPNKNJYoNiLuLjjVlbBkHjo02OdVtUTsZY9p8q6Ysq67Mp+oZwNLj0td qksyiAtEGTfnpY83Ba537heX7NgOwbFgHNL8NKu2eNshJyDiQZX+bCTDcNaFJHeaIJl5EH fZs16ua1wgmvrpGc2fhRErTwee16EMReEcRJGDc7LY707zxSzl+LB/06Agt9lsn5y5EwTh VIq15OcS6ILgHJJzqlAnv9VKN2sHgJPree0C++lTiuSEM8JT3KypmsbFsoQaWtv6nRY2oV RA3MbM8UN6AmDaFVE/o1mpgoMKjyjhkSH0cjWPuxj+4GG/YdHeY58aVzfDsBFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692107088; 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=0joZBK3Kckvv1ObCp8aodtnYC1REGiSaeD2fH79R3vc=; b=bpGKPxHrejnDHC4GTChDZvN5gmZ0sI7Obv3lZWJyphiUNobyxozmmK70QPY3jicqdmPTYx Y/8+bx0FvyDja0tL1TDQjMo7KhkW9ukV5aOmpMQdbuacmi04iR6PN3NpiYxLZwMerhO8K4 s4lt5SX+8zN0smc8bbB6ol0ZLoFRUDuSL/IlK726qR6s6SH9Fl8J6biz/5YCAAM6tKeoay /lB86UECZ3pNR9r0wvGuyE9MJtCSkQdMQoy9/Jx3zhRv2cLZ3DbYvdGQ/z9rTiHfXDy30Q J1rIZq8w7dd9PkrKhqsFmSRC4UAMjR76D0EgQqrNw/eHH3RP2DDyE8g1d1i3ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692107088; a=rsa-sha256; cv=none; b=hUW+fot7MtPItK4PwphY4CwrvzHEzidbMjzykEld33IYj4DvJPE++Hr3KayIlZDZYdekB0 dAAy2Uioocj9N0lM54Bwbf0h5CJFWHq/LnCEZ4PMi4Szh6iLRfUDyUAYXOz+jljz0t3cvz 4XwEx6zwaC3unSD3UoLvTSdXLgRtGgQ5oaPb1zp13KB8IFjIRMj7gcf3kgUXC3hydnIg98 S0lElWNPehCmdmCjJWqMy7kHEhXGhX5RAl6ReJOgQtUqfRpbgPRGsjXt5Bfwtvez/TVZ1E hqz2bvaTSW+yhvbRrzT3PHRLkY3N6azCNiigOXRpMznNE2eqb0OixtiPXKtQ8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQCDw3xXxz1Bb2; Tue, 15 Aug 2023 13:44:48 +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 37FDimU9043395; Tue, 15 Aug 2023 13:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FDimKD043392; Tue, 15 Aug 2023 13:44:48 GMT (envelope-from git) Date: Tue, 15 Aug 2023 13:44:48 GMT Message-Id: <202308151344.37FDimKD043392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: bfe6a0afaa71 - main - etdump: warn only once for non El Torito bootable ISO images List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bfe6a0afaa718c88061ee70f2ce970ae8a3ba69d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bfe6a0afaa718c88061ee70f2ce970ae8a3ba69d commit bfe6a0afaa718c88061ee70f2ce970ae8a3ba69d Author: Ed Maste AuthorDate: 2023-04-22 00:36:28 +0000 Commit: Ed Maste CommitDate: 2023-08-15 13:40:39 +0000 etdump: warn only once for non El Torito bootable ISO images Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39869 --- usr.bin/etdump/etdump.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c index b234fc9d7ff8..e393eba61a84 100644 --- a/usr.bin/etdump/etdump.c +++ b/usr.bin/etdump/etdump.c @@ -167,9 +167,8 @@ dump_eltorito(FILE *iso, const char *filename, FILE *outfile, bvd = (boot_volume_descriptor *)buffer; if (memcmp(bvd->identifier, ISO_VOLUME_DESCRIPTOR_STANDARD_ID, 5) != 0) warnx("%s: not a valid ISO", filename); - if (bvd->boot_record_indicator[0] != ISO_VOLUME_DESCRIPTOR_BOOT) - warnx("%s: not an El Torito bootable ISO", filename); - if (memcmp(bvd->boot_system_identifier, ET_ID, 23) != 0) + if (bvd->boot_record_indicator[0] != ISO_VOLUME_DESCRIPTOR_BOOT || + memcmp(bvd->boot_system_identifier, ET_ID, 23) != 0) warnx("%s: not an El Torito bootable ISO", filename); boot_catalog = isonum_731(bvd->boot_catalog_pointer);