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

[no ci] Overlay: show correct version for updated rootfs (#1222)

pull/1225/head
viktorxda 2023-12-31 15:01:50 +01:00 committed by GitHub
parent 0fe13cf583
commit 4edcb37432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
# #
# OpenIPC.org | v.20231228 # OpenIPC.org | v.20231230
# #
scr_version=1.0.27 scr_version=1.0.28
args=" $@" args=" $@"
@ -63,15 +63,16 @@ do_update_rootfs() {
[ ! -f "$x" ] && die "File ${x} not found" [ ! -f "$x" ] && die "File ${x} not found"
local y=/tmp/rootfs local y=/tmp/rootfs
if mkdir -p "$y" && loop=$(losetup -f) && losetup "$loop" "$x" && mount "$loop" "$y"; then if mkdir -p "$y" && loop=$(losetup -f) && losetup "$loop" "$x" && mount "$loop" "$y"; then
rootfs_version=$(get_system_version "$y")
check_soc "$(head -1 ${y}/etc/hostname | cut -d- -f2)" check_soc "$(head -1 ${y}/etc/hostname | cut -d- -f2)"
compare_versions "$system_version" "$(get_system_version "$y")" && exit_update=1 compare_versions "$system_version" "$rootfs_version" && exit_update=1
umount "$y" && rm -rf "$y" && losetup -d "$loop" umount "$y" && rm -rf "$y" && losetup -d "$loop"
[ "1" = "$exit_update" ] && return 0 [ "1" = "$exit_update" ] && return 0
else else
die "Unable to mount $y!" die "Unable to mount $y!"
fi fi
busybox flashcp -v "$x" "$(get_device "rootfs")" busybox flashcp -v "$x" "$(get_device "rootfs")"
echo_c 32 "RootFS updated to $(get_system_version "")" echo_c 32 "RootFS updated to $rootfs_version"
} }
do_wipe_overlay() { do_wipe_overlay() {