summaryrefslogtreecommitdiffstats
path: root/core/modules/hardware-stats
diff options
context:
space:
mode:
authorSimon Rettberg2020-08-27 16:41:25 +0200
committerSimon Rettberg2020-08-27 16:41:25 +0200
commit74af561ca3aa113f0ba9aabbf869073955fce23d (patch)
tree1fe3fa394f6da53088f0451824805d39190f005e /core/modules/hardware-stats
parent[etherwake] Fix etherwake symlink, disable pause frames (diff)
downloadmltk-74af561ca3aa113f0ba9aabbf869073955fce23d.tar.gz
mltk-74af561ca3aa113f0ba9aabbf869073955fce23d.tar.xz
mltk-74af561ca3aa113f0ba9aabbf869073955fce23d.zip
[hardware-stats] Work around more busybox changes
fdisk output changed. sed it into form for now.
Diffstat (limited to 'core/modules/hardware-stats')
-rwxr-xr-xcore/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
index 9a226d51..9de35095 100755
--- a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
+++ b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
@@ -54,7 +54,7 @@ cleanup() {
slxfdisk() {
local binary RET
for binary in "/opt/openslx/sbin/fdisk -u" "busybox fdisk -u" "fdisk"; do
- $binary "$@"
+ $binary "$@" | sed -r 's/\s+[0-9]+,[0-9]+,[0-9]+\s+/ /g' # Work around busybox YET AGAIN changing something in an incompatible way
RET=$?
[ "$RET" = "127" ] && continue # command not found
[ "$RET" = "1" ] && [ "${binary%% *}" = "busybox" ] && continue # maybe applet not found