Only consider lspci if /sys/bus/pci/devices exists

Author: hmlendea

scripts/common/filesystem.sh

@@ -56,6 +56,9 @@ ROOT_PROC="${ROOT_PATH}/proc"
 ROOT_ROOT="${ROOT_PATH}/root"
 ROOT_SRV="${ROOT_PATH}/srv"
 ROOT_SYS="${ROOT_PATH}/sys"
+ROOT_SYS_BUS="${ROOT_SYS}/bus"
+ROOT_SYS_BUS_PCI="${ROOT_SYS_BUS}/pci"
+ROOT_SYS_BUS_PCI_DEVICES="${ROOT_SYS_BUS_PCI}/devices"
 ROOT_SYS_DEVICES="${ROOT_SYS}/devices"
 ROOT_USR="${ROOT_PATH}/usr"
 
@@ -134,6 +137,8 @@ function does_bin_exist() {
 
         if grep -q '^/' <<< "${BINARY_NAME}" \
         && does_file_exist "${BINARY_NAME}"; then
+            [ "${BINARY_NAME}" = 'lspci' ] && [ ! -e "${ROOT_SYS_BUS_PCI_DEVICES}" ] && return 1 # False
+
             return 0 # True
         fi
     done

scripts/common/system-info.sh

@@ -213,7 +213,8 @@ function get_soc_name() {
     fi
 
     if [ -z "${SOC_MODEL}" ] \
-    && does_bin_exist "lspci"; then
+    && [ -f "${ROOT_SYS_PCI_DEVICES}" ] \
+    && does_bin_exist 'lspci'; then
         if lspci | grep -q "\sPCI bridge:.*BCM[0-9]\+\s"; then
             SOC_MODEL=$(lspci | \
                 grep "\sPCI bridge:" | \
@@ -292,7 +293,8 @@ function get_cpu_model() {
     fi
 
     if [ -z "${MODEL}" ] \
-    && does_bin_exist "lspci"; then
+    && [ -f "${ROOT_SYS_PCI_DEVICES}" ] \
+    && does_bin_exist 'lspci'; then
         if lspci | grep -q "\sPCI bridge:.*BCM[0-9]\+\s"; then
             MODEL=$(lspci | \
                 grep "\sPCI bridge:" | \
@@ -364,7 +366,8 @@ function get_cpu_family() {
     fi
 
     if [ -z "${VENDOR}" ] \
-    && does_bin_exist "lspci"; then
+    && [ -f "${ROOT_SYS_PCI_DEVICES}" ] \
+    && does_bin_exist 'lspci'; then
         CPU_LINE=$(lspci | grep "\sPCI bridge:" | head -n 1)
         VENDOR="$(get_cpu_vendor_from_line ${CPU_LINE})"
     fi