From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5541FD24454 for ; Thu, 10 Oct 2024 21:45:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sz0xR-0001rv-Rd; Thu, 10 Oct 2024 17:44:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sz0xB-0001lZ-SX for grub-devel@gnu.org; Thu, 10 Oct 2024 17:44:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sz0x6-0003vm-O8 for grub-devel@gnu.org; Thu, 10 Oct 2024 17:44:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728596646; 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: in-reply-to:in-reply-to:references:references; bh=3TO1HkkRZmshxocKizJepG+ntpA4k27sj9eOFe9DeXc=; b=OUcGcggosSGQF3mhVJxCenH3UhjknkYVTGFkWB+5FbLXKGyrmIav9v/U5TsJG7YvGT2Bu2 F+dkM8dQfoS0JFqc7NCj0LK+O2YDh8I2YyL9qQI9SQb4tH0MFL3i7Ya37Jl1J6OomuFrRI iPHwr9YlJFhVPblLSCwTyZDqg4YO5eA= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-389-_RMY8hVQMaGO0kM4wt3VTA-1; Thu, 10 Oct 2024 17:44:05 -0400 X-MC-Unique: _RMY8hVQMaGO0kM4wt3VTA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B2FCB1955F3E for ; Thu, 10 Oct 2024 21:44:04 +0000 (UTC) Received: from localhost.localdomain (unknown [10.2.16.8]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0BEB319560A3 for ; Thu, 10 Oct 2024 21:44:03 +0000 (UTC) From: Leo Sandoval To: grub-devel@gnu.org Subject: [PATCH v3 16/16] normal/main: Try $prefix if $fw_path doesn't work. Date: Thu, 10 Oct 2024 15:43:34 -0600 Message-ID: <20241010214334.1749167-17-lsandova@redhat.com> In-Reply-To: <20241010214334.1749167-1-lsandova@redhat.com> References: <20241010214334.1749167-1-lsandova@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.129.124; envelope-from=lsandova@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.149, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org Sender: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org RnJvbTogUGV0ZXIgSm9uZXMgPHBqb25lc0ByZWRoYXQuY29tPgoKUmVsYXRlZDogcmhieiMxMTQ4 NjUyCgpTaWduZWQtb2ZmLWJ5OiBQZXRlciBKb25lcyA8cGpvbmVzQHJlZGhhdC5jb20+Ci0tLQog Z3J1Yi1jb3JlL2tlcm4vaWVlZTEyNzUvaW5pdC5jIHwgIDI4ICsrKy0tLS0KIGdydWItY29yZS9u ZXQvbmV0LmMgICAgICAgICAgICB8ICAgMiArLQogZ3J1Yi1jb3JlL25vcm1hbC9tYWluLmMgICAg ICAgIHwgMTMyICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFu Z2VkLCA4MSBpbnNlcnRpb25zKCspLCA4MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ncnVi LWNvcmUva2Vybi9pZWVlMTI3NS9pbml0LmMgYi9ncnViLWNvcmUva2Vybi9pZWVlMTI3NS9pbml0 LmMKaW5kZXggNTBjNjViMmY2Li41MWMxZTFjOWQgMTAwNjQ0Ci0tLSBhL2dydWItY29yZS9rZXJu L2llZWUxMjc1L2luaXQuYworKysgYi9ncnViLWNvcmUva2Vybi9pZWVlMTI3NS9pbml0LmMKQEAg LTE3MCwyMyArMTcwLDI1IEBAIGdydWJfbWFjaGluZV9nZXRfYm9vdGxvY2F0aW9uIChjaGFyICoq ZGV2aWNlLCBjaGFyICoqcGF0aCkKICAgICAgIGdydWJfZnJlZSAoY2Fub24pOwogICAgIH0KICAg ZWxzZQotICAgICpkZXZpY2UgPSBncnViX2llZWUxMjc1X2VuY29kZV9kZXZuYW1lIChib290cGF0 aCk7Ci0gIGdydWJfZnJlZSAodHlwZSk7Ci0KLSAgZmlsZW5hbWUgPSBncnViX2llZWUxMjc1X2dl dF9maWxlbmFtZSAoYm9vdHBhdGgpOwotICBpZiAoZmlsZW5hbWUpCiAgICAgewotICAgICAgY2hh ciAqbGFzdHNsYXNoID0gZ3J1Yl9zdHJyY2hyIChmaWxlbmFtZSwgJ1xcJyk7Ci0KLSAgICAgIC8q IFRydW5jYXRlIGF0IGxhc3QgZGlyZWN0b3J5LiAgKi8KLSAgICAgIGlmIChsYXN0c2xhc2gpCisg ICAgICBmaWxlbmFtZSA9IGdydWJfaWVlZTEyNzVfZ2V0X2ZpbGVuYW1lIChib290cGF0aCk7Cisg ICAgICBpZiAoZmlsZW5hbWUpCiAgICAgICAgIHsKLQkgICpsYXN0c2xhc2ggPSAnXDAnOwotCSAg Z3J1Yl90cmFuc2xhdGVfaWVlZTEyNzVfcGF0aCAoZmlsZW5hbWUpOworICAgICAgICAgIGNoYXIg Kmxhc3RzbGFzaCA9IGdydWJfc3RycmNociAoZmlsZW5hbWUsICdcXCcpOwogCi0JICAqcGF0aCA9 IGZpbGVuYW1lOwotCX0KKyAgICAgICAgICAvKiBUcnVuY2F0ZSBhdCBsYXN0IGRpcmVjdG9yeS4g ICovCisgICAgICAgICAgaWYgKGxhc3RzbGFzaCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgKmxhc3RzbGFzaCA9ICdcMCc7CisgICAgICAgICAgICAgIGdydWJfdHJhbnNsYXRlX2llZWUx Mjc1X3BhdGggKGZpbGVuYW1lKTsKKworICAgICAgICAgICAgICAqcGF0aCA9IGZpbGVuYW1lOwor ICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAqZGV2aWNlID0gZ3J1Yl9pZWVlMTI3NV9l bmNvZGVfZGV2bmFtZSAoYm9vdHBhdGgpOwogICAgIH0KKworICBncnViX2ZyZWUgKHR5cGUpOwog ICBncnViX2ZyZWUgKGJvb3RwYXRoKTsKIH0KIApkaWZmIC0tZ2l0IGEvZ3J1Yi1jb3JlL25ldC9u ZXQuYyBiL2dydWItY29yZS9uZXQvbmV0LmMKaW5kZXggOGNhZDRmYjZkLi41NDQ1MWNlYTIgMTAw NjQ0Ci0tLSBhL2dydWItY29yZS9uZXQvbmV0LmMKKysrIGIvZ3J1Yi1jb3JlL25ldC9uZXQuYwpA QCAtMjAwNSw3ICsyMDA1LDcgQEAgZ3J1Yl9uZXRfc2VhcmNoX2NvbmZpZ19maWxlIChjaGFyICpj b25maWcpCiAgIC8qIFJlbW92ZSB0aGUgcmVtYWluaW5nIG1pbnVzIHNpZ24gYXQgdGhlIGVuZC4g Ki8KICAgY29uZmlnW2NvbmZpZ19sZW5dID0gJ1wwJzsKIAotICByZXR1cm4gR1JVQl9FUlJfTk9O RTsKKyAgcmV0dXJuIEdSVUJfRVJSX0ZJTEVfTk9UX0ZPVU5EOwogfQogCiBzdGF0aWMgc3RydWN0 IGdydWJfcHJlYm9vdCAqZmluaV9obmQ7CmRpZmYgLS1naXQgYS9ncnViLWNvcmUvbm9ybWFsL21h aW4uYyBiL2dydWItY29yZS9ub3JtYWwvbWFpbi5jCmluZGV4IDk3M2U3ZDczMy4uNzUwYzZjMjBj IDEwMDY0NAotLS0gYS9ncnViLWNvcmUvbm9ybWFsL21haW4uYworKysgYi9ncnViLWNvcmUvbm9y bWFsL21haW4uYwpAQCAtMzI5LDgxICszMjksNzkgQEAgZ3J1Yl9lbnRlcl9ub3JtYWxfbW9kZSAo Y29uc3QgY2hhciAqY29uZmlnKQogICBncnViX2Jvb3RfdGltZSAoIkV4aXRpbmcgbm9ybWFsIG1v ZGUiKTsKIH0KIAorc3RhdGljIGdydWJfZXJyX3QKK2dydWJfdHJ5X25vcm1hbCAoY29uc3QgY2hh ciAqdmFyaWFibGUpCit7CisgICAgY2hhciAqY29uZmlnOworICAgIGNvbnN0IGNoYXIgKnByZWZp eDsKKyAgICBncnViX2Vycl90IGVyciA9IEdSVUJfRVJSX0ZJTEVfTk9UX0ZPVU5EOworICAgIGNv bnN0IGNoYXIgKm5ldF9zZWFyY2hfY2ZnOworICAgIGludCBkaXNhYmxlX25ldF9zZWFyY2ggPSAw OworCisgICAgcHJlZml4ID0gZ3J1Yl9lbnZfZ2V0ICh2YXJpYWJsZSk7CisgICAgaWYgKCFwcmVm aXgpCisgICAgICByZXR1cm4gR1JVQl9FUlJfRklMRV9OT1RfRk9VTkQ7CisKKyAgICBuZXRfc2Vh cmNoX2NmZyA9IGdydWJfZW52X2dldCAoImZlYXR1cmVfbmV0X3NlYXJjaF9jZmciKTsKKyAgICBp ZiAobmV0X3NlYXJjaF9jZmcgJiYgbmV0X3NlYXJjaF9jZmdbMF0gPT0gJ24nKQorICAgICAgZGlz YWJsZV9uZXRfc2VhcmNoID0gMTsKKworICAgIGlmIChncnViX3N0cm5jbXAgKHByZWZpeCArIDEs ICJ0ZnRwIiwgc2l6ZW9mICgidGZ0cCIpIC0gMSkgPT0gMCAmJgorICAgICAgICAhZGlzYWJsZV9u ZXRfc2VhcmNoKQorICAgICAgeworICAgICAgIGdydWJfc2l6ZV90IGNvbmZpZ19sZW47CisgICAg ICAgY29uZmlnX2xlbiA9IGdydWJfc3RybGVuIChwcmVmaXgpICsKKyAgICAgICAgIHNpemVvZiAo Ii9ncnViLmNmZy1YWFhYWFhYWC1YWFhYLVhYWFgtWFhYWC1YWFhYWFhYWFhYWFgiKTsKKyAgICAg ICBjb25maWcgPSBncnViX21hbGxvYyAoY29uZmlnX2xlbik7CisKKyAgICAgICBpZiAoISBjb25m aWcpCisgICAgICAgICByZXR1cm4gR1JVQl9FUlJfRklMRV9OT1RfRk9VTkQ7CisKKyAgICAgICBn cnViX3NucHJpbnRmIChjb25maWcsIGNvbmZpZ19sZW4sICIlcy9ncnViLmNmZyIsIHByZWZpeCk7 CisgICAgICAgZXJyID0gZ3J1Yl9uZXRfc2VhcmNoX2NvbmZpZ19maWxlIChjb25maWcpOworICAg ICAgfQorCisgICAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQorICAgICAgeworICAgICAgIGNv bmZpZyA9IGdydWJfeGFzcHJpbnRmICgiJXMvZ3J1Yi5jZmciLCBwcmVmaXgpOworICAgICAgIGlm IChjb25maWcpCisgICAgICAgICB7CisgICAgICAgICAgIGdydWJfZmlsZV90IGZpbGU7CisgICAg ICAgICAgIGZpbGUgPSBncnViX2ZpbGVfb3BlbiAoY29uZmlnLCBHUlVCX0ZJTEVfVFlQRV9DT05G SUcpOworICAgICAgICAgICBpZiAoZmlsZSkKKyAgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICBncnViX2ZpbGVfY2xvc2UgKGZpbGUpOworICAgICAgICAgICAgICAgZXJyID0gR1JVQl9FUlJf Tk9ORTsKKyAgICAgICAgICAgICB9CisgICAgICAgICB9CisgICAgICB9CisKKyAgICBpZiAoZXJy ID09IEdSVUJfRVJSX05PTkUpCisgICAgICBncnViX2VudGVyX25vcm1hbF9tb2RlIChjb25maWcp OworCisgICAgZ3J1Yl9lcnJubyA9IDA7CisgICAgZ3J1Yl9mcmVlIChjb25maWcpOworICAgIHJl dHVybiBlcnI7Cit9CisKIC8qIEVudGVyIG5vcm1hbCBtb2RlIGZyb20gcmVzY3VlIG1vZGUuICAq Lwogc3RhdGljIGdydWJfZXJyX3QKIGdydWJfY21kX25vcm1hbCAoc3RydWN0IGdydWJfY29tbWFu ZCAqY21kIF9fYXR0cmlidXRlX18gKCh1bnVzZWQpKSwKIAkJIGludCBhcmdjLCBjaGFyICphcmd2 W10pCiB7Ci0gIGlmIChhcmdjID09IDApCisgIGlmIChhcmdjKQorICAgIGdydWJfZW50ZXJfbm9y bWFsX21vZGUgKGFyZ3ZbMF0pOworICBlbHNlCiAgICAgewotICAgICAgLyogR3Vlc3MgdGhlIGNv bmZpZyBmaWxlbmFtZS4gSXQgaXMgbmVjZXNzYXJ5IHRvIG1ha2UgQ09ORklHIHN0YXRpYywKLQkg c28gdGhhdCBpdCB3b24ndCBnZXQgYnJva2VuIGJ5IGxvbmdqbXAuICAqLwotICAgICAgY2hhciAq Y29uZmlnOwotICAgICAgY29uc3QgY2hhciAqcHJlZml4OwotICAgICAgY29uc3QgY2hhciAqbmV0 X3NlYXJjaF9jZmc7Ci0gICAgICBpbnQgZGlzYWJsZV9uZXRfc2VhcmNoID0gMDsKLQotICAgICAg cHJlZml4ID0gZ3J1Yl9lbnZfZ2V0ICgiZndfcGF0aCIpOwotICAgICAgaWYgKCEgcHJlZml4KQot CSAgICAgIHByZWZpeCA9IGdydWJfZW52X2dldCAoInByZWZpeCIpOwotCi0gICAgICBuZXRfc2Vh cmNoX2NmZyA9IGdydWJfZW52X2dldCAoImZlYXR1cmVfbmV0X3NlYXJjaF9jZmciKTsKLSAgICAg IGlmIChuZXRfc2VhcmNoX2NmZyAmJiBuZXRfc2VhcmNoX2NmZ1swXSA9PSAnbicpCi0JICAgICAg ZGlzYWJsZV9uZXRfc2VhcmNoID0gMTsKLQotICAgICAgaWYgKHByZWZpeCkKLSAgICAgICAgewot ICAgICAgICAgIGlmIChncnViX3N0cm5jbXAgKHByZWZpeCArIDEsICJ0ZnRwIiwgc2l6ZW9mICgi dGZ0cCIpIC0gMSkgPT0gMCAmJgotICAgICAgICAgICAgICAhZGlzYWJsZV9uZXRfc2VhcmNoKQot ICAgICAgICAgICAgewotICAgICAgICAgICAgICBncnViX3NpemVfdCBjb25maWdfbGVuOwotICAg ICAgICAgICAgICBjb25maWdfbGVuID0gZ3J1Yl9zdHJsZW4gKHByZWZpeCkgKwotICAgICAgICAg ICAgICAgIHNpemVvZiAoIi9ncnViLmNmZy1YWFhYWFhYWC1YWFhYLVhYWFgtWFhYWC1YWFhYWFhY WFhYWFgiKTsKLSAgICAgICAgICAgICAgY29uZmlnID0gZ3J1Yl9tYWxsb2MgKGNvbmZpZ19sZW4p OwotCi0gICAgICAgICAgICAgIGlmICghIGNvbmZpZykKLSAgICAgICAgICAgICAgICBnb3RvIHF1 aXQ7Ci0KLSAgICAgICAgICAgICAgZ3J1Yl9zbnByaW50ZiAoY29uZmlnLCBjb25maWdfbGVuLCAi JXMvZ3J1Yi5jZmciLCBwcmVmaXgpOwotCi0gICAgICAgICAgICAgIGdydWJfbmV0X3NlYXJjaF9j b25maWdmaWxlIChjb25maWcpOwotCi0gICAgICAgICAgICAgIGdydWJfZW50ZXJfbm9ybWFsX21v ZGUgKGNvbmZpZyk7Ci0gICAgICAgICAgICAgIGdydWJfZnJlZSAoY29uZmlnKTsKLSAgICAgICAg ICAgICAgY29uZmlnID0gTlVMTDsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgIGlmICghY29u ZmlnKQotICAgICAgICAgICAgewotICAgICAgICAgICAgICBjb25maWcgPSBncnViX3hhc3ByaW50 ZiAoIiVzL2dydWIuY2ZnIiwgcHJlZml4KTsKLSAgICAgICAgICAgICAgaWYgKGNvbmZpZykKLSAg ICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICBncnViX2ZpbGVfdCBmaWxlOwotCi0g ICAgICAgICAgICAgICAgICBmaWxlID0gZ3J1Yl9maWxlX29wZW4gKGNvbmZpZywgR1JVQl9GSUxF X1RZUEVfQ09ORklHKTsKLSAgICAgICAgICAgICAgICAgIGlmIChmaWxlKQotICAgICAgICAgICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgZ3J1Yl9maWxlX2Nsb3NlIChmaWxlKTsK LSAgICAgICAgICAgICAgICAgICAgICBncnViX2VudGVyX25vcm1hbF9tb2RlIChjb25maWcpOwot ICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAvKiAgSWdub3JlIGFsbCBlcnJvcnMu ICAqLwotICAgICAgICAgICAgICAgICAgICAgIGdydWJfZXJybm8gPSAwOwotICAgICAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICBncnViX2ZyZWUgKGNvbmZpZyk7Ci0gICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICBlbHNlCi0gICAgICAg IHsKLSAgICAgICAgICBncnViX2VudGVyX25vcm1hbF9tb2RlICgwKTsKLSAgICAgICAgfQorICAg ICAgLyogR3Vlc3MgdGhlIGNvbmZpZyBmaWxlbmFtZS4gKi8KKyAgICAgIGdydWJfZXJyX3QgZXJy OworICAgICAgZXJyID0gZ3J1Yl90cnlfbm9ybWFsICgiZndfcGF0aCIpOworICAgICAgaWYgKGVy ciA9PSBHUlVCX0VSUl9GSUxFX05PVF9GT1VORCkKKyAgICAgICAgZXJyID0gZ3J1Yl90cnlfbm9y bWFsICgicHJlZml4Iik7CisgICAgICBpZiAoZXJyID09IEdSVUJfRVJSX0ZJTEVfTk9UX0ZPVU5E KQorICAgICAgICBncnViX2VudGVyX25vcm1hbF9tb2RlICgwKTsKICAgICB9Ci0gIGVsc2UKLSAg ICBncnViX2VudGVyX25vcm1hbF9tb2RlIChhcmd2WzBdKTsKIAotcXVpdDoKICAgcmV0dXJuIDA7 CiB9CiAKLS0gCjIuNDYuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkdydWItZGV2ZWwgbWFpbGluZyBsaXN0CkdydWItZGV2ZWxAZ251Lm9yZwpodHRw czovL2xpc3RzLmdudS5vcmcvbWFpbG1hbi9saXN0aW5mby9ncnViLWRldmVsCg==