raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-20 21:13:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

rpi-eeprom-update: Add support for config txt processing hooks

Browse Source
This commit is contained in:
Tim Gover
2019-12-10 10:34:26 +00:00
parent 16abe98714
commit 560f001e99
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rpi-eeprom-update
View File

@@ -57,6 +57,9 @@ cleanup() {
if [ -f "${TMP_EEPROM_CONFIG}" ]; then if [ -f "${TMP_EEPROM_CONFIG}" ]; then
rm -f "${TMP_EEPROM_CONFIG}" rm -f "${TMP_EEPROM_CONFIG}"
fi fi
if [ -f "${NEW_EEPROM_CONFIG}" ]; then
rm -f "${NEW_EEPROM_CONFIG}"
fi
if [ -d "${TMP_BOOTFS_MNT}" ]; then if [ -d "${TMP_BOOTFS_MNT}" ]; then
umount "${TMP_BOOTFS_MNT}" umount "${TMP_BOOTFS_MNT}"
rmdir "${TMP_BOOTFS_MNT}" rmdir "${TMP_BOOTFS_MNT}"
@@ -64,6 +67,7 @@ cleanup() {
TMP_BOOTFS_MNT= TMP_BOOTFS_MNT=
TMP_EEPROM_IMAGE= TMP_EEPROM_IMAGE=
TMP_EEPROM_CONFIG= TMP_EEPROM_CONFIG=
NEW_EEPROM_CONFIG=
} }
trap cleanup EXIT trap cleanup EXIT
@@ -77,6 +81,7 @@ prepareImage()
[ -f "${BOOTLOADER_UPDATE_IMAGE}" ] || die "EEPROM image \'${BOOTLOADER_UPDATE_IMAGE}\' not found" [ -f "${BOOTLOADER_UPDATE_IMAGE}" ] || die "EEPROM image \'${BOOTLOADER_UPDATE_IMAGE}\' not found"
TMP_EEPROM_IMAGE="$(mktemp)" TMP_EEPROM_IMAGE="$(mktemp)"
TMP_EEPROM_CONFIG="$(mktemp)" TMP_EEPROM_CONFIG="$(mktemp)"
NEW_EEPROM_CONFIG="$(mktemp)"
mkdir -p "${FIRMWARE_BACKUP_DIR}" mkdir -p "${FIRMWARE_BACKUP_DIR}"
@@ -85,7 +90,17 @@ prepareImage()
backup="${FIRMWARE_BACKUP_DIR}/pieeprom-backup-$(date +%Y%m%d-%H%M%S).conf" backup="${FIRMWARE_BACKUP_DIR}/pieeprom-backup-$(date +%Y%m%d-%H%M%S).conf"
cp -f "${TMP_EEPROM_CONFIG}" "${backup}" cp -f "${TMP_EEPROM_CONFIG}" "${backup}"
if [ "$(wc -l "${TMP_EEPROM_CONFIG}" | awk '{print $1}')" -lt 3 ]; then if [ -x "${EEPROM_CONFIG_HOOK}" ]; then
echo "Running EEPROM config hook ${EEPROM_CONFIG_HOOK}"
if ! "${EEPROM_CONFIG_HOOK}" -u "${BOOTLOADER_UPDATE_IMAGE}" < "${TMP_EEPROM_CONFIG}" > "${NEW_EEPROM_CONFIG}"; then
echo "EEPROM config hook \"${EEPROM_CONFIG_HOOK}\" failed. Using original configuration"
cp -f "${TMP_EEPROM_CONFIG}" "${NEW_EEPROM_CONFIG}"
fi
else
cp -f "${TMP_EEPROM_CONFIG}" "${NEW_EEPROM_CONFIG}"
fi
if [ "$(wc -l "${NEW_EEPROM_CONFIG}" | awk '{print $1}')" -lt 3 ]; then
# Don't propagate empty EEPROM config files and also prevent the initial # Don't propagate empty EEPROM config files and also prevent the initial
# bootloader config with WAKE_ON_GPIO=0 propgating to newer versions by # bootloader config with WAKE_ON_GPIO=0 propgating to newer versions by
# accident. # accident.
@@ -97,7 +112,7 @@ prepareImage()
if [ "${OVERWRITE_CONFIG}" = 0 ]; then if [ "${OVERWRITE_CONFIG}" = 0 ]; then
"${script_dir}/rpi-eeprom-config" \ "${script_dir}/rpi-eeprom-config" \
--out "${TMP_EEPROM_IMAGE}" \ --out "${TMP_EEPROM_IMAGE}" \
--config "${TMP_EEPROM_CONFIG}" "${BOOTLOADER_UPDATE_IMAGE}" --config "${NEW_EEPROM_CONFIG}" "${BOOTLOADER_UPDATE_IMAGE}"
fi fi
} }

1
rpi-eeprom-update-default
View File

@@ -5,3 +5,4 @@ FIRMWARE_IMAGE_DIR="${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}"
FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup" FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup"
BOOTFS=/boot BOOTFS=/boot
USE_FLASHROM=0 USE_FLASHROM=0
EEPROM_CONFIG_HOOK=