OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Sysupgrade: invoke busybox for critical commands (#811)

pull/813/head
viktorxda 2023-05-21 16:23:18 +02:00 committed by GitHub
parent d2791563fd
commit 60a2f3854f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
general/overlay/usr/sbin/sysupgrade
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
# #
# OpenIPC.org | v.20230518 # OpenIPC.org | v.20230520
# #
scr_version=1.0.18 scr_version=1.0.19
args=" $@" args=" $@"
@ -53,7 +53,7 @@ do_update_kernel() {
esac esac
compare_versions "$kernel_version" "$(get_kernel_version "$x")" && return 0 compare_versions "$kernel_version" "$(get_kernel_version "$x")" && return 0
fi fi
flashcp -v "$x" "$kernel_device" busybox flashcp -v "$x" "$kernel_device"
echo_c 32 "Kernel updated to $(get_kernel_version "$kernel_device")" echo_c 32 "Kernel updated to $(get_kernel_version "$kernel_device")"
} }
@ -72,8 +72,7 @@ do_update_rootfs() {
else else
die "Unable to mount $y!" die "Unable to mount $y!"
fi fi
busybox flashcp -v "$x" "$(get_device "rootfs")"
flashcp -v "$x" "$(get_device "rootfs")"
echo_c 32 "RootFS updated to $(get_system_version "")" echo_c 32 "RootFS updated to $(get_system_version "")"
} }
@ -81,7 +80,7 @@ do_wipe_overlay() {
echo_c 33 "\nOverlayFS" echo_c 33 "\nOverlayFS"
echo "Erase overlay partition" echo "Erase overlay partition"
[ $(get_flash_type mtd) = "nand" ] || jffs2="-j" [ $(get_flash_type mtd) = "nand" ] || jffs2="-j"
flash_eraseall $jffs2 "$(get_device "rootfs_data")" busybox flash_eraseall $jffs2 "$(get_device "rootfs_data")"
} }
download_firmware() { download_firmware() {
@ -252,7 +251,7 @@ reboot_system() {
exit 1 exit 1
else else
echo_c 37 "\nUnconditional reboot" echo_c 37 "\nUnconditional reboot"
reboot -d 1 -f busybox reboot -d 1 -f
fi fi
} }