From 7682ed2503a54dae6175ef489df7bbe11b95e9c6 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 21 Jul 2016 15:48:24 +0100 Subject: [PATCH] Tweak disk detection diagnostics to match what is going on better Signed-off-by: Justin Cormack --- alpine/packages/diagnostics/diagnostics | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/packages/diagnostics/diagnostics b/alpine/packages/diagnostics/diagnostics index 477a3c0de..1c56e46f2 100755 --- a/alpine/packages/diagnostics/diagnostics +++ b/alpine/packages/diagnostics/diagnostics @@ -1,9 +1,9 @@ #!/bin/sh printf '\n' -DEV=$(ls /dev | grep '[sxv]da$') +DEV="$(lsblk -r | grep ' disk $' | awk '{print $1}' | head -1 )" [ $? -eq 0 ] && printf "✓ Drive found: $DEV\n" || printf "✗ No drive found\n" -DEV=$(mount | grep '/dev/[sxv]da. on /var type') +DEV=$(mount | grep '/dev/.*da. on /var type') [ $? -eq 0 ] && printf "✓ Drive mounted: $DEV\n" || printf "✗ No drive mounted\n" INET=$(ifconfig eth0 2> /dev/null | grep 'inet addr') [ $? -eq 0 ] && printf "✓ Network connected: $INET\n" || printf "✗ No network connection\n"