From 993ac539443f2d801bcf8f4f6019491644d978cf Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 19 Sep 2019 21:02:41 +0100 Subject: [PATCH 1/2] init: add fix for RPi4 serial numbers --- packages/sysutils/busybox/scripts/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 820fed0dbf..d4c2afa8fe 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -48,7 +48,7 @@ BREAK_TRIPPED="no" BIGFONT="1080" # Get a serial number if present (eg. RPi) otherwise use MAC address from eth0 -MACHINE_UID="$(cat /proc/cpuinfo | awk '/^Serial/{s=$3; gsub ("^0*","",s); print s}')" +MACHINE_UID="$(awk '/^Serial/{s='0000000' $3; print substr(s, length(s) - 7)}' /proc/cpuinfo)" [ -z "$MACHINE_UID" ] && MACHINE_UID="$(cat /sys/class/net/eth0/address 2>/dev/null | tr -d :)" # common functions From 077b0ef606aba88d693e0002f6ca54eb6f47ece0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 19 Sep 2019 21:52:22 +0200 Subject: [PATCH 2/2] rpi-eeprom: allow overriding BOOTFS from environment Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/config/rpi-eeprom-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/rpi-eeprom/config/rpi-eeprom-update b/packages/tools/rpi-eeprom/config/rpi-eeprom-update index 0e85be4214..0a62ac0b4a 100644 --- a/packages/tools/rpi-eeprom/config/rpi-eeprom-update +++ b/packages/tools/rpi-eeprom/config/rpi-eeprom-update @@ -1,4 +1,4 @@ # Use direct path to firmware as update script doesn't dereference sym links. FIRMWARE_ROOT="/usr/lib/kernel-overlays/base/lib/firmware/raspberrypi/bootloader" FIRMWARE_BACKUP_DIR="/storage/.config/rpifw-backup" -BOOTFS=/flash +BOOTFS=${BOOTFS:-/flash}