:try/catch dmesg during grains collection

saltstack · Dec 3, 2024 · d0bb349 · d0bb349
1 parent 9d10d69
commit d0bb349
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/changelog/67083.fixed.md b/changelog/67083.fixed.md
@@ -0,0 +1 @@
+Ubuntu can run salt-master without root
diff --git a/salt/grains/core.py b/salt/grains/core.py
@@ -1105,9 +1105,15 @@ def _virtual(osdata):
                     if os.path.isdir("/sys/bus/xen/drivers/xenconsole"):
                         # An actual DomU will have the xenconsole driver
                         grains["virtual_subtype"] = "Xen PV DomU"
-                    elif "xen:" in __salt__["cmd.run"]("dmesg").lower():
-                        # Fallback to parsing dmesg, might not be successful
-                        grains["virtual_subtype"] = "Xen PV DomU"
+                    else:
+                        try:
+                            if "xen:" in __salt__["cmd.run"]("dmesg").lower():
+                                # Fallback to parsing dmesg, might not be successful
+                                grains["virtual_subtype"] = "Xen PV DomU"
+                        except salt.exceptions.CommandExecutionError as e:
+                            log.debug(
+                                "Could not detect virtual_subtype with dmesg: {}".format(e)
+                            )
             # If a Dom0 or DomU was detected, obviously this is xen
             if "dom" in grains.get("virtual_subtype", "").lower():
                 grains["virtual"] = "xen"