diff options
| -rw-r--r-- | cb/elogind.cbp | 1 | ||||
| -rw-r--r-- | src/login/logind-dbus.c | 15 | ||||
| -rw-r--r-- | src/shared/efivars.h | 130 |
3 files changed, 14 insertions, 132 deletions
diff --git a/cb/elogind.cbp b/cb/elogind.cbp index 4ccb9d3c2..e45f59371 100644 --- a/cb/elogind.cbp +++ b/cb/elogind.cbp @@ -478,7 +478,6 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="../src/shared/conf-parser.h" /> - <Unit filename="../src/shared/efivars.h" /> <Unit filename="../src/shared/output-mode.h" /> <Unit filename="../src/shared/pager.c"> <Option compilerVar="CC" /> diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index ab9c5728e..5383538d1 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -32,7 +32,7 @@ #include "bus-error.h" #include "bus-util.h" #include "dirent-util.h" -#include "efivars.h" +//#include "efivars.h" #include "escape.h" #include "fd-util.h" #include "fileio-label.h" @@ -2294,6 +2294,8 @@ static int property_get_reboot_to_firmware_setup( sd_bus_message *reply, void *userdata, sd_bus_error *error) { +/// elogind does not support EFI +#if 0 int r; assert(bus); @@ -2305,6 +2307,9 @@ static int property_get_reboot_to_firmware_setup( return r; return sd_bus_message_append(reply, "b", r > 0); +#else + return sd_bus_message_append(reply, "b", -EOPNOTSUPP); +#endif // 0 } static int method_set_reboot_to_firmware_setup( @@ -2335,9 +2340,12 @@ static int method_set_reboot_to_firmware_setup( if (r == 0) return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ +/// elogind does not support EFI +#if 0 r = efi_set_reboot_to_firmware(b); if (r < 0) return r; +#endif // 0 return sd_bus_reply_method_return(message, NULL); } @@ -2347,6 +2355,8 @@ static int method_can_reboot_to_firmware_setup( void *userdata, sd_bus_error *error) { +/// elogind does not support EFI +#if 0 int r; bool challenge; const char *result; @@ -2379,6 +2389,9 @@ static int method_can_reboot_to_firmware_setup( result = "no"; return sd_bus_reply_method_return(message, "s", result); +#else + return sd_bus_reply_method_return(message, "s", "na"); +#endif // 0 } static int method_set_wall_message( diff --git a/src/shared/efivars.h b/src/shared/efivars.h deleted file mode 100644 index e953a1273..000000000 --- a/src/shared/efivars.h +++ /dev/null @@ -1,130 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2013 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see <http://www.gnu.org/licenses/>. -***/ - -#include <stdbool.h> - -#include "sd-id128.h" -#include "time-util.h" - -#define EFI_VENDOR_LOADER SD_ID128_MAKE(4a,67,b0,82,0a,4c,41,cf,b6,c7,44,0b,29,bb,8c,4f) -#define EFI_VENDOR_GLOBAL SD_ID128_MAKE(8b,e4,df,61,93,ca,11,d2,aa,0d,00,e0,98,03,2b,8c) -#define EFI_VARIABLE_NON_VOLATILE 0x0000000000000001 -#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x0000000000000002 -#define EFI_VARIABLE_RUNTIME_ACCESS 0x0000000000000004 - -#ifdef ENABLE_EFI - -bool is_efi_boot(void); -bool is_efi_secure_boot(void); -bool is_efi_secure_boot_setup_mode(void); -int efi_reboot_to_firmware_supported(void); -int efi_get_reboot_to_firmware(void); -int efi_set_reboot_to_firmware(bool value); - -int efi_get_variable(sd_id128_t vendor, const char *name, uint32_t *attribute, void **value, size_t *size); -int efi_set_variable(sd_id128_t vendor, const char *name, const void *value, size_t size); -int efi_get_variable_string(sd_id128_t vendor, const char *name, char **p); - -int efi_get_boot_option(uint16_t nr, char **title, sd_id128_t *part_uuid, char **path, bool *active); -int efi_add_boot_option(uint16_t id, const char *title, uint32_t part, uint64_t pstart, uint64_t psize, sd_id128_t part_uuid, const char *path); -int efi_remove_boot_option(uint16_t id); -int efi_get_boot_order(uint16_t **order); -int efi_set_boot_order(uint16_t *order, size_t n); -int efi_get_boot_options(uint16_t **options); - -int efi_loader_get_device_part_uuid(sd_id128_t *u); -int efi_loader_get_boot_usec(usec_t *firmware, usec_t *loader); - -#else - -static inline bool is_efi_boot(void) { - return false; -} - -static inline bool is_efi_secure_boot(void) { - return false; -} - -static inline bool is_efi_secure_boot_setup_mode(void) { - return false; -} - -static inline int efi_reboot_to_firmware_supported(void) { - return -EOPNOTSUPP; -} - -static inline int efi_get_reboot_to_firmware(void) { - return -EOPNOTSUPP; -} - -static inline int efi_set_reboot_to_firmware(bool value) { - return -EOPNOTSUPP; -} - -static inline int efi_get_variable(sd_id128_t vendor, const char *name, uint32_t *attribute, void **value, size_t *size) { - return -EOPNOTSUPP; -} - -static inline int efi_set_variable(sd_id128_t vendor, const char *name, const void *value, size_t size) { - return -EOPNOTSUPP; -} - -static inline int efi_get_variable_string(sd_id128_t vendor, const char *name, char **p) { - return -EOPNOTSUPP; -} - -static inline int efi_get_boot_option(uint16_t nr, char **title, sd_id128_t *part_uuid, char **path, bool *active) { - return -EOPNOTSUPP; -} - -static inline int efi_add_boot_option(uint16_t id, const char *title, uint32_t part, uint64_t pstart, uint64_t psize, sd_id128_t part_uuid, const char *path) { - return -EOPNOTSUPP; -} - -static inline int efi_remove_boot_option(uint16_t id) { - return -EOPNOTSUPP; -} - -static inline int efi_get_boot_order(uint16_t **order) { - return -EOPNOTSUPP; -} - -static inline int efi_set_boot_order(uint16_t *order, size_t n) { - return -EOPNOTSUPP; -} - -static inline int efi_get_boot_options(uint16_t **options) { - return -EOPNOTSUPP; -} - -static inline int efi_loader_get_device_part_uuid(sd_id128_t *u) { - return -EOPNOTSUPP; -} - -static inline int efi_loader_get_boot_usec(usec_t *firmware, usec_t *loader) { - return -EOPNOTSUPP; -} - -#endif - -char *efi_tilt_backslashes(char *s); |