File grains.extra-support-old-non-x86-kernels-bsc-11... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File grains.extra-support-old-non-x86-kernels-bsc-1180650.patch of Package salt (Revision 481e6e92f2b8b17b1cf91f2fa67aaf14)

Currently displaying revision 481e6e92f2b8b17b1cf91f2fa67aaf14 , Show latest

From 95bb0986fa8b09abb75ba431c9e593d710688568 Mon Sep 17 00:00:00 2001
From: Alberto Planas <aplanas@suse.com>
Date: Mon, 10 May 2021 16:25:49 +0200
Subject: [PATCH] grains.extra: support old non-x86 kernels
 (bsc#1180650) (#366)

---
 salt/grains/extra.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/salt/grains/extra.py b/salt/grains/extra.py
index f80061ff4e..45251e77e3 100644
--- a/salt/grains/extra.py
+++ b/salt/grains/extra.py
@@ -89,10 +89,10 @@ def suse_backported_capabilities():
     }
 
 
-def __secure_boot():
+def __secure_boot(efivars_dir):
     """Detect if secure-boot is enabled."""
     enabled = False
-    sboot = glob.glob("/sys/firmware/efi/vars/SecureBoot-*/data")
+    sboot = glob.glob(os.path.join(efivars_dir, "SecureBoot-*/data"))
     if len(sboot) == 1:
         # The minion is usually running as a privileged user, but is
         # not the case for the master.  Seems that the master can also
@@ -107,9 +107,17 @@ def __secure_boot():
 
 def uefi():
     """Populate UEFI grains."""
+    efivars_dir = next(
+        iter(
+            filter(
+                os.path.exists, ["/sys/firmware/efi/efivars", "/sys/firmware/efi/vars"]
+            )
+        ),
+        None,
+    )
     grains = {
-        "efi": os.path.exists("/sys/firmware/efi/systab"),
-        "efi-secure-boot": __secure_boot(),
+        "efi": bool(efivars_dir),
+        "efi-secure-boot": __secure_boot(efivars_dir) if efivars_dir else False,
     }
 
     return grains
-- 
2.31.1

Places

File grains.extra-support-old-non-x86-kernels-bsc-1180650.patch of Package salt (Revision 481e6e92f2b8b17b1cf91f2fa67aaf14)

Places