domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mvebu: base-files: autodetect upgrade device

Browse Source 
Since some boards could be also booted from other mediums than SD card,
lets make the upgrade block device autodetected.

Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
This commit is contained in:
Tomasz Maciej Nowak
2019-03-28 18:07:08 +01:00
committed by Hauke Mehrtens
parent 727c3df5bb
commit 4e8345ff68
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/mvebu/base-files/lib/preinit/79_move_config
View File

@@ -1,12 +1,13 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2015 OpenWrt.org # Copyright (C) 2015 OpenWrt.org
BOOTPART=/dev/mmcblk0p1
. /lib/functions.sh . /lib/functions.sh
. /lib/upgrade/common.sh
move_config() { move_config() {
if [ -b $BOOTPART ]; then local partdev
if export_bootdevice && export_partdevice partdev 1; then
case $(board_name) in case $(board_name) in
turris-omnia) turris-omnia)
insmod nls_cp437 insmod nls_cp437
@@ -16,7 +17,7 @@ move_config() {
;; ;;
esac esac
mkdir -p /boot mkdir -p /boot
mount -o rw,noatime $BOOTPART /boot mount -o rw,noatime "/dev/$partdev" /boot
[ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz / [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
umount /boot umount /boot
fi fi

11
target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
View File

@@ -19,9 +19,12 @@ platform_check_image_sdcard() {
platform_do_upgrade_sdcard() { platform_do_upgrade_sdcard() {
local board=$(board_name) local board=$(board_name)
local diskdev
sync sync
get_image "$1" | dd of=/dev/mmcblk0 bs=2M conv=fsync if export_bootdevice && export_partdevice diskdev 0; then
get_image "$1" | dd of=/dev/$diskdev bs=2M conv=fsync
fi
case "$board" in case "$board" in
armada-385-turris-omnia) armada-385-turris-omnia)
@@ -36,9 +39,13 @@ platform_do_upgrade_sdcard() {
} }
platform_copy_config_sdcard() { platform_copy_config_sdcard() {
local partdev
if export_partdevice partdev 1; then
mkdir -p /boot mkdir -p /boot
[ -f /boot/kernel.img ] || mount -o rw,noatime /dev/mmcblk0p1 /boot [ -f /boot/kernel.img ] || mount -o rw,noatime /dev/$partdev /boot
cp -af "$CONF_TAR" /boot/ cp -af "$CONF_TAR" /boot/
sync sync
umount /boot umount /boot
fi
} }