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

Imply SKIP_KERNEL=1 when custom kernel file name is set (#235)

Browse Source 
Skip installation of kernel and .dtb files if the user has a
custom kernel.

Prevents users ending up with a bricked system that hangs on
rainbow screen, because the 4.9.x .dtb files do not work
with a 4.4.x custom kernel.

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
This commit is contained in:
maxnet
2017-03-11 14:59:56 +01:00
committed by popcornmix
parent ca8378d882
commit d74ace7328
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rpi-update
View File

@@ -42,6 +42,10 @@ FW_REV=${1:-""}
FW_REVFILE="${FW_PATH}/.firmware_revision" FW_REVFILE="${FW_PATH}/.firmware_revision"
[ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=0 rpi-update" && exit 1 [ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=0 rpi-update" && exit 1
if command -v vcgencmd > /dev/null; then
vcgencmd get_config str | grep -qE "^kernel=" && echo -e "You appear to be using a custom kernel file.\nSkipping installation of new kernel, as bundled dtb files may be incompatible with your kernel." && SKIP_KERNEL=1
fi
function update_self() { function update_self() {
echo " *** Performing self-update" echo " *** Performing self-update"
_tempFileName="$0.tmp" _tempFileName="$0.tmp"