Merge pull request #3853 from MilhouseVH/le10_rpi_serial_bottom_32bits

init: add fix for RPi4 serial numbers
This commit is contained in:
CvH 2019-09-24 21:18:29 +02:00 committed by GitHub
commit ac18ab32f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -48,7 +48,7 @@ BREAK_TRIPPED="no"
BIGFONT="1080" BIGFONT="1080"
# Get a serial number if present (eg. RPi) otherwise use MAC address from eth0 # 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 :)" [ -z "$MACHINE_UID" ] && MACHINE_UID="$(cat /sys/class/net/eth0/address 2>/dev/null | tr -d :)"
# common functions # common functions

View File

@ -1,4 +1,4 @@
# Use direct path to firmware as update script doesn't dereference sym links. # 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_ROOT="/usr/lib/kernel-overlays/base/lib/firmware/raspberrypi/bootloader"
FIRMWARE_BACKUP_DIR="/storage/.config/rpifw-backup" FIRMWARE_BACKUP_DIR="/storage/.config/rpifw-backup"
BOOTFS=/flash BOOTFS=${BOOTFS:-/flash}