From 86d19b3700d9a1da8572a914499f4f37de12b980 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Fri, 3 Apr 2020 19:30:07 +0800
Subject: [PATCH] bcm27xx: rpi4: luci: set architecture

---
 .../bcm27xx/base-files/lib/preinit/79_move_config    |  2 +-
 .../linux/bcm27xx/base-files/lib/preinit/82_set_rpi4 | 12 ++++++++++++
 .../bcm27xx/base-files/lib/preinit/82_set_wifi_vht   | 11 -----------
 3 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4
 delete mode 100644 target/linux/bcm27xx/base-files/lib/preinit/82_set_wifi_vht

diff --git a/target/linux/bcm27xx/base-files/lib/preinit/79_move_config b/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
index b8738b645e..a2a2efecb0 100644
--- a/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
+++ b/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
@@ -13,7 +13,7 @@ move_config() {
 		insmod vfat
 		mkdir -p /boot
 		mount -t vfat -o rw,noatime $BOOTPART /boot
-		[ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
+		[ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
 	fi
 }
 
diff --git a/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4 b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4
new file mode 100644
index 0000000000..b75f0ca418
--- /dev/null
+++ b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set_rpi4() {
+	case "$(board_name)" in
+	raspberrypi,4-model-b)
+		sed -i 's/VHT80/VHT40/g' /lib/wifi/mac80211.sh
+		sed -i 's|pcdata(boardinfo.system or "?")|luci.sys.exec("uname -m") or "?"|g' /usr/lib/lua/luci/view/admin_status/index.htm
+		;;
+	esac
+}
+
+boot_hook_add preinit_main set_rpi4
diff --git a/target/linux/bcm27xx/base-files/lib/preinit/82_set_wifi_vht b/target/linux/bcm27xx/base-files/lib/preinit/82_set_wifi_vht
deleted file mode 100644
index 58237ad822..0000000000
--- a/target/linux/bcm27xx/base-files/lib/preinit/82_set_wifi_vht
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set_wifi_vht() {
-    case "$(board_name)" in
-    raspberrypi,4-model-b)
-        sed -i 's/VHT80/VHT40/g' /lib/wifi/mac80211.sh
-        ;;
-    esac
-}
-
-boot_hook_add preinit_main set_wifi_vht