summaryrefslogtreecommitdiffstats
path: root/remote/modules/hardware-stats/data
diff options
context:
space:
mode:
authorJonathan Bauer2016-01-08 14:28:46 +0100
committerJonathan Bauer2016-01-08 14:28:46 +0100
commit7106ee223592a0591e267daa7f71162e4ad658b0 (patch)
tree490d793b56807918cbd6197086b5251d08a18145 /remote/modules/hardware-stats/data
parent[exam] renamed safe-mode service to 'exam.service' and removed unneeded code (diff)
parent[run-virt] openslx.exe: Hide console, re-set logoff caption periodically (diff)
downloadtm-scripts-7106ee223592a0591e267daa7f71162e4ad658b0.tar.gz
tm-scripts-7106ee223592a0591e267daa7f71162e4ad658b0.tar.xz
tm-scripts-7106ee223592a0591e267daa7f71162e4ad658b0.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/hardware-stats/data')
-rwxr-xr-xremote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats3
1 files changed, 2 insertions, 1 deletions
diff --git a/remote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats b/remote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
index 2b54e3e7..6c0b667b 100755
--- a/remote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
+++ b/remote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
@@ -138,11 +138,12 @@ dmidec() {
echo "$MODEL"
}
MODEL=$(dmidec -s system-product-name)
+MANUF=$(dmidec -s system-manufacturer)
# Try fallback to baseboard
if [ "$MODEL" = "Unknown" ]; then
MODEL=$(dmidec -s baseboard-product-name)
+ MANUF=$(dmidec -s baseboard-manufacturer)
fi
-MANUF=$(dmidec -s baseboard-manufacturer)
if [ "$MANUF" != "Unknown" ]; then
MODEL="$MODEL ($MANUF)"