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

Better handling output of systemctl --version

Browse source
This commit is contained in:
vzhestkov 2024-08-28 14:21:56 +02:00 • committed by Daniel Wozniak
parent 8db71dd316
commit 47e412cc5c
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
salt/grains/core.py
View file

@ -2517,10 +2517,31 @@ def _systemd():
"""
Return the systemd grain
"""
systemd_info = __salt__["cmd.run"]("systemctl --version").splitlines()
systemd_version = "UNDEFINED"
systemd_features = ""
try:
systemd_output = __salt__["cmd.run_all"]("systemctl --version")
except Exception: # pylint: disable=broad-except
log.error("Exception while executing `systemctl --version`", exc_info=True)
return {
"version": systemd_version,
"features": systemd_features,
}
if systemd_output.get("retcode") == 0:
systemd_info = systemd_output.get("stdout", "").splitlines()
try:
if systemd_info[0].startswith("systemd "):
systemd_version = systemd_info[0].split()[1]
systemd_features = systemd_info[1]
except IndexError:
pass
if systemd_version == "UNDEFINED" or systemd_features == "":
log.error(
"Unexpected output returned by `systemctl --version`: %s", systemd_output
)
return {
"version": systemd_info[0].split()[1],
"features": systemd_info[1],
"version": systemd_version,
"features": systemd_features,
}