facts: fix efibootmgr.EFIBootMgr if command installed but not UEFI

pyinfra-dev · Oct 31, 2024 · 44d12c3 · 44d12c3
1 parent c31f325
commit 44d12c3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/pyinfra/facts/efibootmgr.py b/pyinfra/facts/efibootmgr.py
@@ -42,9 +42,11 @@ def requires_command(self, *args: Any, **kwargs: Any) -> str:
         return "efibootmgr"
 
     def command(self) -> str:
-        return "efibootmgr"
+        # FIXME: Use '|| true' to properly handle the case where
+        #        'efibootmgr' is run on a non-UEFI system
+        return "efibootmgr || true"
 
-    def process(self, output: Iterable[str]) -> EFIBootMgrInfoDict:
+    def process(self, output: Iterable[str]) -> Optional[EFIBootMgrInfoDict]:
         # This parsing code closely follows the printing code of efibootmgr
         # at <https://github.com/rhboot/efibootmgr/blob/main/src/efibootmgr.c#L2020-L2048>
 
@@ -60,6 +62,12 @@ def process(self, output: Iterable[str]) -> EFIBootMgrInfoDict:
 
         line: Optional[str] = next(output, None)
 
+        if line is None:
+            # efibootmgr run on a non-UEFI system, likely printed
+            # "EFI variables are not supported on this system."
+            # to stderr
+            return None
+
         # 1. Maybe have BootNext
         if line and line.startswith("BootNext: "):
             info["BootNext"] = int(line.removeprefix("BootNext: "), 16)

diff --git a/tests/facts/efibootmgr.EFIBootMgr/boot_entries.json b/tests/facts/efibootmgr.EFIBootMgr/boot_entries.json
@@ -1,5 +1,5 @@
 {
-    "command": "efibootmgr",
+    "command": "efibootmgr || true",
     "requires_command": "efibootmgr",
     "output": [
         "BootCurrent: 0002",

diff --git a/tests/facts/efibootmgr.EFIBootMgr/boot_entries2.json b/tests/facts/efibootmgr.EFIBootMgr/boot_entries2.json
@@ -1,5 +1,5 @@
 {
-    "command": "efibootmgr",
+    "command": "efibootmgr || true",
     "requires_command": "efibootmgr",
     "output": [
         "BootCurrent: 0000",

diff --git a/tests/facts/efibootmgr.EFIBootMgr/boot_entries_complex.json b/tests/facts/efibootmgr.EFIBootMgr/boot_entries_complex.json
@@ -1,5 +1,5 @@
 {
-    "command": "efibootmgr",
+    "command": "efibootmgr || true",
     "requires_command": "efibootmgr",
     "output": [
         "BootNext: 0006",

diff --git a/tests/facts/efibootmgr.EFIBootMgr/not_uefi.json b/tests/facts/efibootmgr.EFIBootMgr/not_uefi.json
@@ -1,8 +1,6 @@
 {
-    "command": "efibootmgr",
+    "command": "efibootmgr || true",
     "requires_command": "efibootmgr",
-    "output": [
-        "EFI variables are not supported on this system."
-    ],
+    "output": [],
     "fact": null
 }