From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 12 Jan 2021 11:43:02 +0000 (+0900)
Subject: boot: at least one of os_name_pretty or os_name exists in this block
X-Git-Tag: v248-rc1~368^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecb3e9fba368d5fa5c6241bdb7b4d97fd6827d7b;p=thirdparty%2Fsystemd.git

boot: at least one of os_name_pretty or os_name exists in this block

Closes CID#1438933.
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 938e5645f9d..60305f07f9c 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -1988,8 +1988,8 @@ static VOID config_entry_add_linux(
                         path = PoolPrint(L"\\EFI\\Linux\\%s", f->FileName);
 
                         entry = config_entry_add_loader(config, device, LOADER_LINUX, f->FileName, 'l',
-                                                        os_name_pretty ? : (os_name ? : os_id), path,
-                                                        os_version ? : (os_version_id ? : os_build_id));
+                                                        os_name_pretty ?: os_name, path,
+                                                        os_version ?: (os_version_id ? : os_build_id));
 
                         FreePool(content);
                         content = NULL;