mirror of
https://github.com/systemd/systemd
synced 2024-07-24 03:36:24 +00:00
hibernate-resume-config: apply ENABLE_EFI ifdef correctly
Currently, validate_efi_hibernate_location is fully conditioned out if !ENABLE_EFI, but get_efi_hibernate_location() still calls it.
This commit is contained in:
parent
ae4088b23e
commit
52e555fa27
|
@ -140,7 +140,7 @@ static bool validate_efi_hibernate_location(EFIHibernateLocation *e) {
|
|||
#endif
|
||||
|
||||
int get_efi_hibernate_location(EFIHibernateLocation **ret) {
|
||||
|
||||
#if ENABLE_EFI
|
||||
static const JsonDispatch dispatch_table[] = {
|
||||
{ "uuid", JSON_VARIANT_STRING, json_dispatch_id128, offsetof(EFIHibernateLocation, uuid), JSON_MANDATORY },
|
||||
{ "offset", _JSON_VARIANT_TYPE_INVALID, json_dispatch_uint64, offsetof(EFIHibernateLocation, offset), JSON_MANDATORY },
|
||||
|
@ -200,6 +200,7 @@ int get_efi_hibernate_location(EFIHibernateLocation **ret) {
|
|||
return 1;
|
||||
|
||||
skip:
|
||||
#endif
|
||||
if (ret)
|
||||
*ret = NULL;
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue