From e8078662e87e33f79730061708324437b0097768 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 21 Apr 2022 17:44:14 +0200
Subject: [run-virt/hardware-stats] Move dependencies around

---
 .../run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'core/modules/run-virt/data/opt')

diff --git a/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt b/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt
index 2621ec83..5285009e 100755
--- a/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt
+++ b/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt
@@ -15,19 +15,18 @@ elif [ "$HW_KVM" = "UNSUPPORTED" ]; then
 fi
 
 if [ -n "$HW_MBRAM" ] && [ "$HW_MBRAM" -lt 3400 ]; then
-  GB=$(( ( HW_MBRAM + 300 ) / 1024 ))
+	GB=$(( ( HW_MBRAM + 300 ) / 1024 ))
 	echo "slx-virt-lowmemory|${GB}"
 fi
 
-if [ -n "$SLX_VM_NFS" ] && ! systemctl status mount-vm-store >/dev/null; then
+if [ -n "$SLX_VM_NFS" ] && systemctl is-failed mount-vm-store.service; then
 	echo 'slx-virt-vmstore-fail'
 fi
 
-# TODO: when native sessions will be rolled out, we should always
-# check if an ID44 partition is present (to back the base OS).
+# Jambo-specific: They mount an NFS share here, so no ID44 doesn't matter
 if fs_path_ismountpoint /tmp/virt; then
 	exit 0
-fi 
+fi
 
 if [ "$HW_ID44" = "0" ]; then
 	echo 'slx-virt-noid44'
-- 
cgit v1.2.3-55-g7522