summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsien <i@zsien.cn>2021-05-10 15:42:54 +0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-05-15 19:54:55 +0200
commit6647cff7766faed5cb57373abc7439b048304638 (patch)
tree3760596bc95bb36135bfe83377b06c24a865dc89
parent45df8bbcacbdea03d9f2c2d9c28e8b774b170578 (diff)
downloadsystemd-6647cff7766faed5cb57373abc7439b048304638.tar.gz
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) (cherry picked from commit 379679f807072b4d554711bc61b769d72ecc98d6)
-rw-r--r--src/boot/bootctl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 511b0105f3..783dabdf79 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 (strcasecmp_ptr(path, opath) != 0)
return false;
return true;