Merge ~bladernr/plainbox-provider-certification-server:1878701 into plainbox-provider-certification-server:master

[Jeff Lane ]

fixed bug in precheck script when lvmdiskscan does not exist (found when testing a small arm board)

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/tools/canonical-certification-precheck b/tools/canonical-certification-precheck
index c8ba2c4..c785108 100755
--- a/tools/canonical-certification-precheck
+++ b/tools/canonical-certification-precheck
@@ -174,17 +174,23 @@ fi
 LVM_Check(){
 name="LVM Check"
 echoname
-local lvmCount=$(sudo lvmdiskscan | awk '/[0-9] LVM/ {print $1}' | tr -d -c 0-9)
-local lvmList=($(sudo lvmdiskscan | awk '/] LVM/ {print $1}'))
-if [ "$lvmCount" -eq "0" ]; then
-    echo -e " LVM not present."
-    pass
+if [ -x "$(command -v lvmdiskscan)" ]; then
+    local lvmCount=$(sudo lvmdiskscan | awk '/[0-9] LVM/ {print $1}' | tr -d -c 0-9)
+    local lvmList=($(sudo lvmdiskscan | awk '/] LVM/ {print $1}'))
+    if [ "$lvmCount" -eq "0" ]; then
+        echo -e " LVM not present."
+        pass
+    else
+        echo -e " LVM members found:"
+        for element in "${lvmList[@]}"; do
+            echo -e " ${element}"
+        done
+        fail
+    fi
 else
-    echo -e " LVM members found:"
-    for element in "${lvmList[@]}"; do
-        echo -e " ${element}"
-    done
-    fail
+   echo -e " lvmdiskscan command not found. Skipping this check."
+   echo -e " You should manually verify that LVM volumes are not present."
+   fail
 fi
 }