Skip to content

Commit

Permalink
treewide: adjust sysupgrade script (coolsnowwolf#4720)
Browse files Browse the repository at this point in the history
This commit fix sysupgrade failed for bcm27xx.
  • Loading branch information
aiamadeus authored Jun 6, 2020
1 parent 6ac928f commit f892bcd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
11 changes: 8 additions & 3 deletions target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mbl_do_platform_check() {

[ "$#" -gt 1 ] && return 1

export_bootdevice && export_partdevice diskdev 0 || {
export_bootdevice && export_partdevice diskdev -2 || {
echo "Unable to determine upgrade device"
return 1
}
Expand Down Expand Up @@ -36,7 +36,7 @@ mbl_do_platform_check() {
mbl_do_upgrade() {
local diskdev partdev diff

export_bootdevice && export_partdevice diskdev 0 || {
export_bootdevice && export_partdevice diskdev -2 || {
echo "Unable to determine upgrade device"
return 1
}
Expand Down Expand Up @@ -70,6 +70,10 @@ mbl_do_upgrade() {

#iterate over each partition from the image and write it to the boot disk
while read part start size; do
# root is /dev/sd[a|b]2 and not /dev/sd[a|b] this causes some problem
# one of which is this offset, I'm not sure what's the best fix, so
# here's a WA.
let part=$((part - 2))
if export_partdevice partdev $part; then
echo "Writing image to /dev/$partdev..."
get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
Expand All @@ -86,7 +90,8 @@ mbl_do_upgrade() {
mbl_copy_config() {
local partdev

if export_partdevice partdev 1; then
# Same as above /dev/sd[a|b]2 is root, so /boot is -1
if export_partdevice partdev -1; then
mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
cp -af "$CONF_TAR" /mnt/
umount /mnt
Expand Down
11 changes: 8 additions & 3 deletions target/linux/bcm27xx/base-files/lib/upgrade/platform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ platform_check_image() {

[ "$#" -gt 1 ] && return 1

export_bootdevice && export_partdevice diskdev 0 || {
export_bootdevice && export_partdevice diskdev -2 || {
echo "Unable to determine upgrade device"
return 1
}
Expand Down Expand Up @@ -38,7 +38,7 @@ platform_check_image() {
platform_do_upgrade() {
local diskdev partdev diff

export_bootdevice && export_partdevice diskdev 0 || {
export_bootdevice && export_partdevice diskdev -2 || {
echo "Unable to determine upgrade device"
return 1
}
Expand Down Expand Up @@ -72,6 +72,10 @@ platform_do_upgrade() {

#iterate over each partition from the image and write it to the boot disk
while read part start size; do
# root is /dev/sd[a|b]2 and not /dev/sd[a|b] this causes some problem
# one of which is this offset, I'm not sure what's the best fix, so
# here's a WA.
let part=$((part - 2))
if export_partdevice partdev $part; then
echo "Writing image to /dev/$partdev..."
get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
Expand All @@ -88,7 +92,8 @@ platform_do_upgrade() {
platform_copy_config() {
local partdev

if export_partdevice partdev 1; then
# Same as above /dev/sd[a|b]2 is root, so /boot is -1
if export_partdevice partdev -1; then
mkdir -p /boot
[ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot
cp -af "$CONF_TAR" /boot/
Expand Down

0 comments on commit f892bcd

Please sign in to comment.