jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2770 from MilhouseVH/le90_amlogic_boot_fix_2

Browse Source 
init: strip leading / from BOOT_IMAGE & DISK_IMAGE, normalising for all projects
This commit is contained in:
Christian Hewitt 2018-06-14 16:59:18 +04:00 committed by GitHub
commit ae2027caeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/sysutils/busybox/scripts/init
View File

@ -92,9 +92,11 @@
case $arg in case $arg in
BOOT_IMAGE=*) BOOT_IMAGE=*)
IMAGE_KERNEL="${arg#*=}" IMAGE_KERNEL="${arg#*=}"
[ "${IMAGE_KERNEL:0:1}" = "/" ] && IMAGE_KERNEL="${IMAGE_KERNEL:1}"
;; ;;
SYSTEM_IMAGE=*) SYSTEM_IMAGE=*)
IMAGE_SYSTEM="${arg#*=}" IMAGE_SYSTEM="${arg#*=}"
[ "${IMAGE_SYSTEM:0:1}" = "/" ] && IMAGE_SYSTEM="${IMAGE_SYSTEM:1}"
;; ;;
boot=*) boot=*)
boot="${arg#*=}" boot="${arg#*=}"
@ -922,7 +924,7 @@
sync sync
if [ ! -b "$IMAGE_KERNEL" -a ! -f "/flash/$IMAGE_KERNEL" ] || [ ! -f "/flash/$IMAGE_SYSTEM" ]; then if [ ! -b "/$IMAGE_KERNEL" -a ! -f "/flash/$IMAGE_KERNEL" ] || [ ! -f "/flash/$IMAGE_SYSTEM" ]; then
echo "Missing (target) ${IMAGE_KERNEL} or ${IMAGE_SYSTEM}!" echo "Missing (target) ${IMAGE_KERNEL} or ${IMAGE_SYSTEM}!"
do_cleanup do_cleanup
StartProgress countdown "Normal startup in 30s... " 30 "NOW" StartProgress countdown "Normal startup in 30s... " 30 "NOW"
@ -991,7 +993,7 @@
FLASH_FREE=$(( $FLASH_FREE * 1024 )) FLASH_FREE=$(( $FLASH_FREE * 1024 ))
# Disregard kernel size if it's a a block device, which is the case on Amlogic/WeTek devices # Disregard kernel size if it's a a block device, which is the case on Amlogic/WeTek devices
if [ ! -b $IMAGE_KERNEL ]; then if [ ! -b "/$IMAGE_KERNEL" ]; then
OLD_KERNEL=$(stat -t "/flash/$IMAGE_KERNEL" | awk '{print $2}') OLD_KERNEL=$(stat -t "/flash/$IMAGE_KERNEL" | awk '{print $2}')
else else
OLD_KERNEL="0" OLD_KERNEL="0"
@ -1025,8 +1027,8 @@
fi fi
# all ok, update # all ok, update
if [ -b $IMAGE_KERNEL ]; then if [ -b "/$IMAGE_KERNEL" ]; then
update_partition "Kernel" "$UPDATE_KERNEL" "$IMAGE_KERNEL" update_partition "Kernel" "$UPDATE_KERNEL" "/$IMAGE_KERNEL"
else else
update_file "Kernel" "$UPDATE_KERNEL" "/flash/$IMAGE_KERNEL" update_file "Kernel" "$UPDATE_KERNEL" "/flash/$IMAGE_KERNEL"
fi fi