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

Merge pull request #37 from timg236/removePreviousUpdate

Browse Source 
rpi-eeprom-update: Don't remove update files if run with no arguments
This commit is contained in:
timg
2019-10-23 12:21:29 +01:00
committed by GitHub
parent 63c6c210c0 e024ab5373
commit 08da16716a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rpi-eeprom-update
View File

@@ -285,6 +285,7 @@ rpi-eeprom-update [options]... [FILE]
-h Display help text and exit -h Display help text and exit
-j Write status information using JSON notation -j Write status information using JSON notation
-m Write status information to the given file when run without -a or -f -m Write status information to the given file when run without -a or -f
-r Removes temporary EEPROM update files from the boot partition.
-u Install the specified VL805 (USB EEPROM) image file. -u Install the specified VL805 (USB EEPROM) image file.
To extract the configuration file from an EEPROM image: To extract the configuration file from an EEPROM image:
@@ -394,6 +395,7 @@ lookupVersionInfo()
checkAndApply() checkAndApply()
{ {
lookupVersionInfo lookupVersionInfo
removePreviousUpdates
# Restrict the automatic updates to the EEPROM types selected by the -A option. # Restrict the automatic updates to the EEPROM types selected by the -A option.
if [ "${AUTO_UPDATE_VL805}" != 1 ]; then if [ "${AUTO_UPDATE_VL805}" != 1 ]; then
@@ -417,6 +419,7 @@ checkAndApply()
fileUpdate() fileUpdate()
{ {
removePreviousUpdates
echo "*** INSTALLING ${BOOTLOADER_UPDATE_IMAGE} ${VL805_UPDATE_IMAGE} ***" echo "*** INSTALLING ${BOOTLOADER_UPDATE_IMAGE} ${VL805_UPDATE_IMAGE} ***"
if [ -n "${BOOTLOADER_UPDATE_IMAGE}" ]; then if [ -n "${BOOTLOADER_UPDATE_IMAGE}" ]; then
@@ -501,7 +504,7 @@ AUTO_UPDATE_VL805=0
MACHINE_OUTPUT="" MACHINE_OUTPUT=""
JSON_OUTPUT="no" JSON_OUTPUT="no"
while getopts A:adhf:m:ju: option; do while getopts A:adhf:m:ju:r option; do
case "${option}" in case "${option}" in
A) A)
if [ "${OPTARG}" = "bootloader" ]; then if [ "${OPTARG}" = "bootloader" ]; then
@@ -525,6 +528,11 @@ while getopts A:adhf:m:ju: option; do
;; ;;
h) usage h) usage
;; ;;
r) [ "$(id -u)" = "0" ] || die "* Must be run as root - try 'sudo rpi-eeprom-update -r'"
echo "Removing temporary files from previous EEPROM update"
removePreviousUpdates
exit 0
;;
u) VL805_UPDATE_IMAGE="${OPTARG}" u) VL805_UPDATE_IMAGE="${OPTARG}"
;; ;;
*) echo "Unknown argument \"${option}\"" *) echo "Unknown argument \"${option}\""
@@ -534,7 +542,6 @@ while getopts A:adhf:m:ju: option; do
done done
checkDependencies checkDependencies
removePreviousUpdates
if [ "${AUTO_UPDATE_BOOTLOADER}" = 1 ] || [ "${AUTO_UPDATE_VL805}" = 1 ]; then if [ "${AUTO_UPDATE_BOOTLOADER}" = 1 ] || [ "${AUTO_UPDATE_VL805}" = 1 ]; then
if vcgencmd bootloader_config | grep FREEZE_VERSION=1; then if vcgencmd bootloader_config | grep FREEZE_VERSION=1; then
echo "EEPROM version is frozen. Skipping update" echo "EEPROM version is frozen. Skipping update"