fix: additional fixups for UNVR/UNVRPro

* Fixup fan control so it works on UNVR
* Add LED integration work for UNVR
* Rename our mtd-ro kernel module dir
* Fixup shortnames in ubnteeprom

overlay/filesystem/usr/bin/unvr-fan-daemon

@@ -3,7 +3,7 @@ import os
 import re
 import time
 
-from ubnthelpers import get_ubnt_shortname
+from functools import lru_cache
 
 SMARTCTL_PATH = "/usr/sbin/smartctl"
 
@@ -36,6 +36,12 @@ THERMAL_SYS_PATHS = {
     },
 }
 
+
+@lru_cache(None)
+def get_ubnt_shortname() -> str:
+    return os.popen("ubnteeprom -systeminfo -key shortname").read().rstrip("\n")
+
+
 def __get_board_temps():
     # Are we supported?
     if get_ubnt_shortname() not in THERMAL_SYS_PATHS:

overlay/filesystem/usr/lib/init/boot/ubnt-ulcmd.sh

@@ -16,7 +16,8 @@ case "$(ubnteeprom -systeminfo -key shortname)" in
         exec ulcmd
         ;;
     "UNVR4")
-        # TODO: LED setup (2=white, 1=blue) against /sys/class/leds/ulogo_ctrl
+        # 2=white, 1=blue, 0=off, needs a value set with :x for ms
+        echo 1:500 > /sys/class/leds/ulogo_ctrl/pattern 
         # Start our "daemon" loop so systemd stays happy
         while true; do
             sleep 3600

overlay/filesystem/usr/lib/python3/dist-packages/ubnthelpers.py

@@ -1,11 +0,0 @@
-#!/usr/bin/python3
-import os
-from functools import lru_cache
-
-"""
-A handful of Ubiquiti Unifi device specific functions
-"""
-
-@lru_cache(None)
-def get_ubnt_shortname() -> str:
-    return os.popen("ubnteeprom -systeminfo -key shortname").read().rstrip("\n")

overlay/filesystem/usr/lib/systemd/system-shutdown/unifi-shutdown

@@ -36,3 +36,8 @@ elif [ -f "/sys/class/hwmon/hwmon0/pwm1" ]; then
 		echo 0 > "${pwm}"
 	done
 fi
+
+# If UNVR, turn off LED
+if [ -f "/sys/class/leds/ulogo_ctrl/pattern" ]; then
+	echo 0:500 > /sys/class/leds/ulogo_ctrl/pattern
+fi

scripts/docker/build_kernel.sh

@@ -55,7 +55,7 @@ mv ./modules-dir ${build_path}/kernel/kernel-modules
 
 # Now that the kernel is done, build our out of tree modules! :)
 module_builddir=$(mktemp -d)
-cp ${root_path}/tools/mtd-lock/* "${module_builddir}"
+cp ${root_path}/tools/ubnt-mtd-lock/* "${module_builddir}"
 cd "${module_builddir}"
 make -C ${kernel_builddir}/${kernel_filename%.tar.gz} M=$PWD
 cp "${module_builddir}/ubnt-mtd-lock.ko" ${build_path}/kernel

scripts/docker/run_debootstrap.sh

@@ -70,8 +70,7 @@ else
 		"${build_path}/rootfs/usr/bin/ubnt-systool" \
 		"${build_path}/rootfs/usr/bin/ubnt-tools" \
 		"${build_path}/rootfs/usr/bin/ustorage" \
-		"${build_path}/rootfs/usr/lib/init/boot/ubnt-ulcmd.sh" \
+		"${build_path}/rootfs/usr/lib/init/boot/ubnt-ulcmd.sh"
-		"${build_path}/rootfs/usr/lib/python3/dist-packages/ubnthelpers.py"
 fi
 
 # Copy over bluetooth firmware files

tools/ubnt-mtd-lock/README.md

@@ -1,6 +1,6 @@
-# mtd-lock
+# ubnt-mtd-lock
 
-A stupid basic kernel module to ensure we set /dev/mtd as RO (fully) in our firmware. This is done to prevent users/bad actors from wiping your bootloader/Unifi EEPROM, which are required for your device to function!
+A stupid basic kernel module to ensure we set /dev/mtd* as RO (fully) in our firmware. This is done to prevent users/bad actors from wiping your bootloader/Unifi EEPROM, which are required for your device to function!
 
 ## Building
 

tools/ubnteeprom/main.go

@@ -15,27 +15,30 @@ import (
 
 // Type for device map
 type UBNTSysMap struct {
-	name, shortname, cpu, sysid string
+	name, shortname, sysshortname, cpu, sysid string
 }
 
 var UBNTDeviceMap = []UBNTSysMap{
 	{
-		name:      "Unifi-NVR-PRO",
+		name:         "UniFi Network Video Recorder Pro",
-		shortname: "UNVRPRO",
+		shortname:    "UNVRPRO",
-		cpu:       "AL324V2",
+		sysshortname: "UNVRPRO",
-		sysid:     "ea20",
+		cpu:          "AL324V2",
+		sysid:        "ea20",
 	},
 	{
-		name:      "UniFi-NVR-4",
+		name:         "UniFi Network Video Recorder",
-		shortname: "UNVR4",
+		shortname:    "UNVR",
-		cpu:       "AL324V2",
+		sysshortname: "UNVR4",
-		sysid:     "ea16", // USB drive (non emmc) variant
+		cpu:          "AL324V2",
+		sysid:        "ea16", // USB drive (non emmc) variant
 	},
 	{
-		name:      "UniFi-NVR-4",
+		name:         "UniFi Network Video Recorder",
-		shortname: "UNVR4",
+		shortname:    "UNVR",
-		cpu:       "AL324V2",
+		sysshortname: "UNVR4",
-		sysid:     "ea1a",
+		cpu:          "AL324V2",
+		sysid:        "ea1a",
 	},
 }
 
@@ -411,7 +414,7 @@ func return_values(rtype string, file string, filter string) {
 	} else if rtype == "system" {
 		okeys = UBNT_SystemInfo_Vars
 		ret_data = append(ret_data, UBNT_Return_Values{name: "cpu", value: ourboard.cpu})
-		ret_data = append(ret_data, UBNT_Return_Values{name: "shortname", value: ourboard.shortname})
+		ret_data = append(ret_data, UBNT_Return_Values{name: "shortname", value: ourboard.sysshortname})
 	} else if rtype == "tools" {
 		okeys = UBNT_Tools_vars
 		ret_data = append(ret_data, UBNT_Return_Values{name: "board.name", value: ourboard.name})