From ba6753cfabc149cc312f33a3c507b1cc0dbcee3b Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 31 Oct 2019 17:00:23 +0100 Subject: [*] introduce system-check * hardware stats now only reports hardware info data in /run/hwinfo and /run/hwreport * system-check hooks will generate lightdm warnings and curl the report to the satellite * run-virt now handles the ID44 warnings to cope for network shares on /tmp/virt WARNING PROFI111! --- .../opt/openslx/system-check/hooks.d/30-run-virt | 44 ++++++++++++++++++++++ .../system-check/lang/de/slx-virt-id44-small | 1 + .../system-check/lang/de/slx-virt-kvm-disabled | 1 + .../system-check/lang/de/slx-virt-kvm-unsupported | 1 + .../system-check/lang/de/slx-virt-lowmemory | 1 + .../openslx/system-check/lang/de/slx-virt-noid44 | 1 + .../system-check/lang/de/slx-virt-noid44-hdd | 0 .../system-check/lang/de/slx-virt-noid44-lowmemory | 1 + .../system-check/lang/de/slx-virt-noid44-nohdd | 1 + .../system-check/lang/de/slx-virt-vmstore-fail | 2 + .../openslx/system-check/lang/en/slx-virt-lowram | 1 + .../openslx/system-check/lang/en/slx-virt-nohdd | 1 + .../openslx/system-check/lang/en/slx-virt-noidd44 | 1 + .../openslx/system-check/tags/slx-virt-id44-small | 2 + .../system-check/tags/slx-virt-kvm-disabled | 2 + .../system-check/tags/slx-virt-kvm-unsupported | 2 + .../openslx/system-check/tags/slx-virt-lowmemory | 2 + .../opt/openslx/system-check/tags/slx-virt-noid44 | 2 + .../openslx/system-check/tags/slx-virt-noid44-hdd | 2 + .../system-check/tags/slx-virt-noid44-lowmemory | 2 + .../system-check/tags/slx-virt-noid44-nohdd | 2 + .../system-check/tags/slx-virt-vmstore-fail | 2 + 22 files changed, 74 insertions(+) create mode 100755 core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-id44-small create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-kvm-disabled create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-kvm-unsupported create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-lowmemory create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44 create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-hdd create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-lowmemory create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-nohdd create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-vmstore-fail create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-lowram create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-nohdd create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-noidd44 create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-id44-small create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-kvm-disabled create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-kvm-unsupported create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-lowmemory create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44 create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-hdd create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-lowmemory create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-nohdd create mode 100644 core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-vmstore-fail (limited to 'core/modules/run-virt/data/opt/openslx') 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 new file mode 100755 index 00000000..2621ec83 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt @@ -0,0 +1,44 @@ +#!/bin/ash + +. /opt/openslx/config +. /opt/openslx/bin/slx-tools +. /run/hwinfo + +if [ -n "$1" ]; then + exec >> "$1" +fi + +if [ "$HW_KVM" = "DISABLED" ]; then + echo 'slx-virt-kvm-disabled' +elif [ "$HW_KVM" = "UNSUPPORTED" ]; then + echo 'slx-virt-kvm-unsupported' +fi + +if [ -n "$HW_MBRAM" ] && [ "$HW_MBRAM" -lt 3400 ]; then + GB=$(( ( HW_MBRAM + 300 ) / 1024 )) + echo "slx-virt-lowmemory|${GB}" +fi + +if [ -n "$SLX_VM_NFS" ] && ! systemctl status mount-vm-store >/dev/null; 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). +if fs_path_ismountpoint /tmp/virt; then + exit 0 +fi + +if [ "$HW_ID44" = "0" ]; then + echo 'slx-virt-noid44' + if [ "$HW_HDDCOUNT" = "0" ]; then + echo 'slx-virt-noid44-nohdd' + elif [ -n "$HW_HDDCOUNT" ]; then + echo 'slx-virt-noid44-hdd' + fi + if [ -n "$HW_MBRAM" ] && [ "$HW_MBRAM" -lt 4500 ]; then + echo 'slx-virt-noid44-lowmemory' + fi +elif [ -n "$HW_ID44" ] && [ "$HW_ID44" -lt 10000 ]; then + echo 'slx-virt-id44-small' +fi diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-id44-small b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-id44-small new file mode 100644 index 00000000..7f18ef1d --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-id44-small @@ -0,0 +1 @@ +* Die ID44-Partition ist sehr klein. VM-Sitzungen könnten nach einiger Zeit aus Speichermangel abstürzen. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-kvm-disabled b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-kvm-disabled new file mode 100644 index 00000000..407c8604 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-kvm-disabled @@ -0,0 +1 @@ +* 64Bit-Gast-Support (VT-x oder AMD-V) ist im BIOS deaktiviert. 64Bit VMs können nicht gestartet werden. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-kvm-unsupported b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-kvm-unsupported new file mode 100644 index 00000000..47e58f38 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-kvm-unsupported @@ -0,0 +1 @@ +* CPU hat keinen 64Bit-Gast-Support (VT-x oder AMD-V). 64Bit VMs können nicht gestartet werden. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-lowmemory b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-lowmemory new file mode 100644 index 00000000..3ccd7389 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-lowmemory @@ -0,0 +1 @@ +* Dieser PC hat wenig RAM (%1%GB). Die Leistung von VM-Sitzungen wird nicht optimal sein. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44 b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44 new file mode 100644 index 00000000..e1938fdb --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44 @@ -0,0 +1 @@ +* Keine ID44-Partition gefunden. VMs bekommen wenig RAM zugewiesen. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-hdd b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-hdd new file mode 100644 index 00000000..e69de29b diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-lowmemory b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-lowmemory new file mode 100644 index 00000000..b92e38ac --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-lowmemory @@ -0,0 +1 @@ + Da der PC wenig RAM hat, ist die Einrichtung einer ID44-Partition dringend zu empfehlen. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-nohdd b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-nohdd new file mode 100644 index 00000000..d3f09b29 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-noid44-nohdd @@ -0,0 +1 @@ + Keine Festplatte erkannt; eine Festplatte wird empfohlen, wenn Sie VMs nutzen wollen. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-vmstore-fail b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-vmstore-fail new file mode 100644 index 00000000..eb5cccf7 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/de/slx-virt-vmstore-fail @@ -0,0 +1,2 @@ +* Der VM-Store konnte nicht eingehängt werden. VMs können nicht gestartet werden. + Versuchen Sie das Problem zu lösen, indem Sie den Computer neu starten. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-lowram b/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-lowram new file mode 100644 index 00000000..b71b3527 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-lowram @@ -0,0 +1 @@ + Since this computer has little memory, it is recommended to setup an ID44 partition. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-nohdd b/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-nohdd new file mode 100644 index 00000000..55cf0065 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-nohdd @@ -0,0 +1 @@ + No hard drive detected; it is recommended to use at least one to use VMs. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-noidd44 b/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-noidd44 new file mode 100644 index 00000000..25b36f02 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/lang/en/slx-virt-noidd44 @@ -0,0 +1 @@ +* No ID44 partition found. VMs will be assigned less RAM. diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-id44-small b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-id44-small new file mode 100644 index 00000000..b1e4f6eb --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-id44-small @@ -0,0 +1,2 @@ +color="000000" +contact=yes diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-kvm-disabled b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-kvm-disabled new file mode 100644 index 00000000..9b452642 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-kvm-disabled @@ -0,0 +1,2 @@ +color="ff0000" +contact=yes diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-kvm-unsupported b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-kvm-unsupported new file mode 100644 index 00000000..0e801767 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-kvm-unsupported @@ -0,0 +1,2 @@ +color="000000" +contact= diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-lowmemory b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-lowmemory new file mode 100644 index 00000000..0e801767 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-lowmemory @@ -0,0 +1,2 @@ +color="000000" +contact= diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44 b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44 new file mode 100644 index 00000000..0e801767 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44 @@ -0,0 +1,2 @@ +color="000000" +contact= diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-hdd b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-hdd new file mode 100644 index 00000000..265ec18f --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-hdd @@ -0,0 +1,2 @@ +color= +contact=yes diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-lowmemory b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-lowmemory new file mode 100644 index 00000000..78745c72 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-lowmemory @@ -0,0 +1,2 @@ +color="ff0000" +contact= diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-nohdd b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-nohdd new file mode 100644 index 00000000..0e801767 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-noid44-nohdd @@ -0,0 +1,2 @@ +color="000000" +contact= diff --git a/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-vmstore-fail b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-vmstore-fail new file mode 100644 index 00000000..78745c72 --- /dev/null +++ b/core/modules/run-virt/data/opt/openslx/system-check/tags/slx-virt-vmstore-fail @@ -0,0 +1,2 @@ +color="ff0000" +contact= -- cgit v1.2.3-55-g7522