saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

sysutils/py-salt: fix the efi grain on FreeBSD

Browse source 
The logic to detect whether we booted from EFI only worked on Linux and
Apple, AFAICT.
This commit is contained in:
Alan Somers 2022-11-09 15:19:02 -07:00 • committed by Daniel Wozniak
parent a87238ec28
commit 1aff51676b
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
salt/grains/extra.py
View file

@ -81,14 +81,25 @@ def __secure_boot(efivars_dir):
def uefi():
"""Populate UEFI grains."""
efivars_dir = next(
filter(os.path.exists, ["/sys/firmware/efi/efivars", "/sys/firmware/efi/vars"]),
None,
)
grains = {
"efi": bool(efivars_dir),
"efi-secure-boot": __secure_boot(efivars_dir) if efivars_dir else False,
}
if salt.utils.platform.is_freebsd():
grains = {
"efi": os.path.exists("/dev/efi"),
# Needs a contributor with a secure boot system to implement this
# part.
"efi-secure-boot": False,
}
else:
# Works on Linux and Apple ?
efivars_dir = next(
filter(
os.path.exists, ["/sys/firmware/efi/efivars", "/sys/firmware/efi/vars"]
),
None,
)
grains = {
"efi": bool(efivars_dir),
"efi-secure-boot": __secure_boot(efivars_dir) if efivars_dir else False,
}
return grains