RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-23 23:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: fix initramfs detection

Browse Source 
Commit "initramfs: switch to tmpfs to fix ujail" switched initramfs to
now use tmpfs, it causes $(rootfs_type) to now return tmpfs when
running initramfs image instead of being empty.

This broke initramfs detection which is required so that when installing
on MikroTik devices firmware partition would first get erased fully
before writing.

So, lets test for $(rootfs_type) returning "tmpfs" instead.

Fixes: 7fd3c68 ("initramfs: switch to tmpfs to fix ujail)

Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Robert Marko 2020-12-20 18:02:54 +01:00 committed by Daniel Golle
parent 0cf3c5dd72
commit 7a181a65f2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
View File

@ -39,7 +39,7 @@ platform_do_upgrade() {
;;
*)
# NOR devices: erase firmware if booted from initramfs
[ -z "$(rootfs_type)" ] && mtd erase firmware
[ "$(rootfs_type)" = "tmpfs" ] && mtd erase firmware
default_do_upgrade "$1"
;;

2
target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
View File

@ -31,7 +31,7 @@ platform_do_upgrade() {
mikrotik,routerboard-760igs|\
mikrotik,routerboard-m11g|\
mikrotik,routerboard-m33g)
[ -z "$(rootfs_type)" ] && mtd erase firmware
[ "$(rootfs_type)" = "tmpfs" ] && mtd erase firmware
;;
asus,rt-ac65p|\
asus,rt-ac85p)