Skip to content

Commit d31031c

Browse files
authored
fix virtual host detection (#622)
1 parent 14bdc3a commit d31031c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

salt/_grains/detect_virt.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55

66
def main():
77
try:
8-
result = subprocess.run(
9-
["/usr/bin/systemd-detect-virt"], stdout=subprocess.PIPE, check=True
10-
).stdout.rstrip()
8+
proc = subprocess.run(
9+
["/usr/bin/systemd-detect-virt"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
10+
)
11+
result = proc.stdout.decode().strip()
12+
if not result:
13+
result = "none"
1114
except FileNotFoundError:
1215
result = "unknown"
1316
return {"detect_virt": result}

0 commit comments

Comments
 (0)