From: Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com>
Date: Sat, 9 Mar 2019 20:44:21 +0000 (+0200)
Subject: Fix compilation without EFI being enabled
X-Git-Tag: v242-rc1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab212633d46e71cce0d8ba982628e685f447ab0a;p=thirdparty%2Fsystemd.git

Fix compilation without EFI being enabled

If EFI is disabled compilation can fail with:

../src/login/logind-dbus.c: In function ‘property_get_reboot_to_boot_loader_entry’:
../src/login/logind-dbus.c:2772:29: error: implicit declaration of function ‘efi_loader_entry_name_valid’; did you mean ‘efi_loader_get_features’? [-Werror=implicit-function-declaration]
                 } else if (!efi_loader_entry_name_valid(v)) {
                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~
                             efi_loader_get_features
../src/login/logind-dbus.c:2772:29: warning: nested extern declaration of ‘efi_loader_entry_name_valid’ [-Wnested-externs]

This adds stub for efi_loader_entry_name_valid() to enable compilation.
---

diff --git a/src/shared/efivars.h b/src/shared/efivars.h
index 92670c82c7d..a545cd47b4c 100644
--- a/src/shared/efivars.h
+++ b/src/shared/efivars.h
@@ -132,6 +132,10 @@ static inline int efi_loader_get_entries(char ***ret) {
         return -EOPNOTSUPP;
 }
 
+static inline bool efi_loader_entry_name_valid(const char *s) {
+        return false;
+}
+
 static inline int efi_loader_get_features(uint64_t *ret) {
         return -EOPNOTSUPP;
 }