From b1ed98c779db805b9115dd7e867e69725029d207 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 20 Oct 2020 16:44:36 +0100 Subject: [PATCH] rpi-eeprom-update: Skip checksums if there is no dpkg info directory --- rpi-eeprom-update | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index af2c56c..9012b5b 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -196,12 +196,11 @@ applyUpdate() { if [ "${IGNORE_DPKG_CHECKSUMS}" = 0 ]; then ( - package_info_dir="/var/lib/dpkg/info/" - package_checksums_file="${package_info_dir}/rpi-eeprom.md5sums" + package_checksums_file="${PACKAGE_INFO_DIR}/rpi-eeprom.md5sums" - if ! grep -qE '\.bin$' "${package_info_dir}/rpi-eeprom.md5sums"; then + if ! grep -qE '\.bin$' "${PACKAGE_INFO_DIR}/rpi-eeprom.md5sums"; then # Try the old rpi-eeprom-images package - package_checksums_file="${package_info_dir}/rpi-eeprom-images.md5sums" + package_checksums_file="${PACKAGE_INFO_DIR}/rpi-eeprom-images.md5sums" fi CHECKSUMS=$(mktemp) @@ -706,7 +705,12 @@ AUTO_UPDATE_BOOTLOADER=0 AUTO_UPDATE_VL805=0 MACHINE_OUTPUT="" JSON_OUTPUT="no" -IGNORE_DPKG_CHECKSUMS=$LOCAL_MODE +IGNORE_DPKG_CHECKSUMS=${LOCAL_MODE} +PACKAGE_INFO_DIR="/var/lib/dpkg/info/" +if [ ! -d "${PACKAGE_INFO_DIR}" ]; then + IGNORE_DPKG_CHECKSUMS=1 +fi + while getopts A:abdhilf:m:ju:r option; do case "${option}" in