init: drop BOOT_IMAGE from RPi/RPi2/Rockchip; fix img upgrades

This commit is contained in:
MilhouseVH
2018-05-07 22:33:43 +01:00
parent 63d995fc9c
commit d8d723d7c2
9 changed files with 11 additions and 17 deletions

View File

@@ -45,7 +45,7 @@
UPDATE_KERNEL="KERNEL"
UPDATE_SYSTEM="SYSTEM"
IMAGE_KERNEL="KERNEL"
IMAGE_KERNEL="@KERNEL_NAME@"
IMAGE_SYSTEM="SYSTEM"
BOOT_STEP="start"
@@ -914,11 +914,7 @@
# don't make temporary files but instead copy
# directly from mountpoint to /flash
UPDATE_DIR=$UPDATE_ROOT/.tmp/mnt
if [ ! -b $IMAGE_KERNEL -o -z "@KERNEL_NAME@" ]; then
UPDATE_KERNEL=$(basename $IMAGE_KERNEL)
else
UPDATE_KERNEL="@KERNEL_NAME@"
fi
UPDATE_KERNEL="@KERNEL_NAME@"
else
UPDATE_FILENAME="$UPDATE_DIR/$UPDATE_SYSTEM"
fi