michael.heier/mynode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix serial for rockpro64

Browse Source
This commit is contained in:
Taylor Helsper 2020-07-09 22:57:17 -05:00
parent 724b8cf212
commit 769f499c96
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rootfs/standard/usr/bin/mynode-get-device-serial Executable file
View File

@ -0,0 +1,12 @@
#!/bin/bash
SERIAL_NUM=$(cat /proc/cpuinfo | grep Serial | cut -d ' ' -f 2)
if [[ "$SERIAL_NUM" == "" ]]; then
SERIAL_NUM=$(sudo dmidecode | grep UUID | cut -d ' ' -f 2)
elif [[ "$SERIAL_NUM" == "0000000000000000" ]]; then
# RockPro64 returns 0s, so use eth0 mac
MAC=$(cat /sys/class/net/eth0/address)
SERIAL_NUM=$(echo "${MAC//:}")
fi
echo $SERIAL_NUM

5
rootfs/standard/usr/share/mynode/mynode_config.sh
View File

@ -39,10 +39,7 @@ fi
TOTAL_RAM_GB=$(free --giga | grep Mem | awk '{print $2}')
SERIAL_NUM=$(cat /proc/cpuinfo | grep Serial | cut -d ' ' -f 2)
if [[ "$SERIAL_NUM" == "" ]]; then
SERIAL_NUM=$(sudo dmidecode | grep UUID | cut -d ' ' -f 2)
fi
SERIAL_NUM=$(mynode-get-device-serial)
# Set all default / standard bash config settings
MYNODE_DIR=/mnt/hdd/mynode

6
rootfs/standard/var/www/mynode/device_info.py
View File

@ -225,12 +225,8 @@ def get_device_serial():
if "serial" in cached_data:
return cached_data["serial"]
serial = subprocess.check_output("cat /proc/cpuinfo | grep Serial | cut -d ' ' -f 2", shell=True)
serial = subprocess.check_output("mynode-get-device-serial", shell=True)
serial = serial.strip()
if serial == "":
# For VMs, use the UUID
serial = subprocess.check_output("sudo dmidecode | grep UUID | cut -d ' ' -f 2", shell=True)
serial = serial.strip()
cached_data["serial"] = serial
return serial