Skip to content

Commit f0ff464

Browse files
committed
Make functions in HCL Report not to exit
HCL report collects information, if smth is missing or not working - it still should be collected by HCL report. Therefore there should be no exit on error inside HCL report. Signed-off-by: Daniil Klimuk <[email protected]>
1 parent 816284c commit f0ff464

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

include/dts-functions.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,9 +713,11 @@ check_flash_chip() {
713713
fi
714714
done
715715
if [ -z "$FLASH_CHIP_SELECT" ]; then
716-
error_exit "No supported chipset found, exit."
716+
return 1
717717
fi
718718
fi
719+
720+
return 0
719721
}
720722

721723
compare_versions() {

reports/touchpad-info

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ path=$($FSREAD_TOOL cat "/sys/bus/i2c/devices/$devname/firmware_node/path")
2222
ACPI_CALL_PATH="/proc/acpi/call"
2323

2424
if [ ! -f "$ACPI_CALL_PATH" ]; then
25-
echo "File ${ACPI_CALL_PATH} doesn\'t exist. Exiting"
26-
exit 3
25+
echo "File ${ACPI_CALL_PATH} doesn\'t exist..."
26+
return 3
2727
fi
2828

2929
echo "$path._DSM bF7F6DF3C67425545AD05B30A3D8938DE 1 1" > ${ACPI_CALL_PATH}

scripts/dasharo-deploy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ if [ "${SYSTEM_VENDOR}" != "QEMU" ] && [ "${SYSTEM_VENDOR}" != "Emulation" ]; th
12181218
# Size of flashchip should be checked before board_config func. because the
12191219
# func. assigns some configs based on the chip size detected for ASUS boards
12201220
# (FIXME).
1221-
check_flash_chip
1221+
check_flash_chip || error_exit "No supported chipset found, exit."
12221222
fi
12231223

12241224
board_config

0 commit comments

Comments
 (0)