Merge pull request #89 from nsacyber/issue/88

[#88] Handle case of empty NVMe nguid
nsacyber · Feb 18, 2020 · 7c4e76b · 7c4e76b
2 parents 8cf4c00 + 98c8764
commit 7c4e76b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -127,7 +127,7 @@ ospackage {
     os=LINUX
     arch=NOARCH
     version='1.1.4'
-    release='1'
+    release='2'
 
     into '/opt/paccor'
     user 'root'

diff --git a/scripts/allcomponents.sh b/scripts/allcomponents.sh
@@ -704,6 +704,9 @@ parseNvmeData () {
         manufacturer="" # Making this appear as it does on windows, lshw doesn't see nvme drives and nvme-cli doesn't return a manufacturer field
         model=$(nvmeGetModelNumberForDevice "$i")
         serial=$(nvmeGetNguidForDevice "$i")
+        if [[ $serial =~ ^[0]+$ ]]; then
+            serial=$(nvmeGetEuiForDevice "$i")
+        fi
         revision="" # empty for a similar reason to the manufacturer field
 
     if [[ -z "${manufacturer// }" ]]; then