From: zsien <i@zsien.cn>
Date: Mon, 10 May 2021 07:42:54 +0000 (+0800)
Subject: bootctl: same entry path check case-insensitive
X-Git-Tag: v248.3~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=379679f807072b4d554711bc61b769d72ecc98d6;p=thirdparty%2Fsystemd.git

bootctl: same entry path check case-insensitive

Some motherboards convert the path to uppercase under certain circumstances
(e.g. after booting into the Boot Menu in the ASUS ROG STRIX B350-F GAMING).

(cherry picked from commit 5c2e5957678462d871c5c2ea5261becec5f8f80f)
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index a684717bb05..84c226269dd 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -669,7 +669,11 @@ static bool same_entry(uint16_t id, sd_id128_t uuid, const char *path) {
                 return false;
         if (!sd_id128_equal(uuid, ouuid))
                 return false;
-        if (!streq_ptr(path, opath))
+
+        /* Some motherboards convert the path to uppercase under certain circumstances
+         * (e.g. after booting into the Boot Menu in the ASUS ROG STRIX B350-F GAMING),
+         * so use case-insensitive checking */
+        if (!strcaseeq_ptr(path, opath))
                 return false;
 
         return true;