fix: fan curve, lcd firmware, NICs, and README.md

* Make improvements to README.md
* Do some fan curve adjustments to try and reduce fan noise
* add dfu-util so ulcmd can flash the touch screen if there's a firmware version mismatch
* Move NIC management away from cloud-init to OMV
* Ensure OMV has hostname set correctly

README.md

@@ -17,7 +17,7 @@ Note that the 1U UNVR is not currently supported as I do not have a unit to test
 
     `docker-ce losetup wget sudo make qemu-user-static squashfs-tools`
 
-3. Run the tool, and sit back and wait for it to do it's thing. Depending on your computer, this may take around an hour or so.
+3. Run the tool, and sit back and wait for it to do it's thing. Depending on your computer, this may take around an hour or so. Also note near the end there will be some scary errors during debootstrap, but this is expected.
 
     `make`
 
@@ -27,7 +27,8 @@ Note that the 1U UNVR is not currently supported as I do not have a unit to test
 
 Note that currently the install process requires UART to modify the u-boot env for booting. In the future, if I can get the latest kernel GPL source, this will not be required.
 
-1. Make sure your UNVR Pro is running the same Unifi firmware as referenced in the README.md in the unifi-firmware directory.
+1. MAKE SURE your UNVR Pro is running the same Unifi firmware as referenced in the README.md in the unifi-firmware directory.
+    * **Failure to do this can cause issues from the installation process not working, to the touch screen not working!**
 1. Build the firmware image (follow the Usage section), and then throw it on an HDD/SSD formatted to ext4. Put said HDD in the UNVR Pro as the only hard drive.
 2. Hook up UART to the UNVR Pro (4 pin header on the PCB near the DC Power Backup port).
 3. Boot the UNVR Pro, and press Escape twice when prompted to get to the u-boot shell. You only have 2 seconds to do this!
@@ -39,11 +40,11 @@ Note that currently the install process requires UART to modify the u-boot env f
     saveenv
     ```
 
-5. Boot into recovery (can use the below command)
+5. Boot into recovery. This can be done using the command below, or by unplugging the UNVR Pro, and holding the reset button for 10~ seconds as you power it back up.
 
     `run bootcmdrecovery`
 
-6. Once recovery boots up, login with `ubnt:ubnt` or `root:ubnt`. You can also use telnet for this instead of UART if you prefer.
+6. Once recovery is booted, login with `ubnt:ubnt` or `root:ubnt`. Note this can be done either via UART, or by telnet to the IP address your UNVR Pro display reports.
 7. Mount your HDD with the firmware image, backup the Unifi firmware, your u-boot env partitions, and then flash our custom firmware to the EMMC. (below command example assumes your ext4 disk partition is at /dev/sda1)
 
     ```
@@ -65,9 +66,22 @@ Note that currently the install process requires UART to modify the u-boot env f
 To restore back to the factory UNVR-Pro firmware, you can do the following steps:
 
 1. Hold the "reset" button on the front while powering on to boot into recovery
-2. Once the display shows it's in recovery, telnet to the IP address. At the login prompt, login with `ubnt:ubnt` or `root:ubnt`.
-3. Erase the uboot env, to remove our custom boot commands. This SHOULD be mtd1/mtd2, but **PLEASE VERIFY** first with `cat /proc/mtd` to prevent bricking your device!
-4. Once the uboot env's are identified, erase them:
+2. Once the display shows it's in recovery, telnet to the IP address shown on the touch screen. At the login prompt, login with `ubnt:ubnt` or `root:ubnt`.
+3. Erase the uboot env, to remove our custom boot commands. This SHOULD be mtd1/mtd2, but **PLEASE VERIFY** first with `cat /proc/mtd` to prevent bricking your device! **DO NOT SKIP THIS STEP!** The output should match below, if not, **PLEASE DO NOT CONTINUE!**
+    
+    ```
+    $ cat /proc/mtd
+    dev:    size   erasesize  name
+    mtd0: 001c0000 00001000 "u-boot"
+    mtd1: 00010000 00001000 "u-boot env"
+    mtd2: 00010000 00001000 "u-boot env redundant"
+    mtd3: 00010000 00001000 "Factory"
+    mtd4: 00010000 00001000 "EEPROM"
+    mtd5: 01000000 00001000 "recovery kernel"
+    mtd6: 00e00000 00001000 "config"
+    ```
+
+4. Once the uboot env's are identified, erase them to remove the setting overrides we added during install:
 
     ```
     dd if=/dev/zero of=/dev/mtd1

overlay/filesystem/etc/cloud/cloud.cfg

@@ -101,7 +101,7 @@ system_info:
     groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video]
     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
     shell: /bin/bash
-  # systemd networking for omv
+  # systemd networking
   network:
     renderers: ['networkd']
     activators: ['networkd']

overlay/filesystem/etc/cloud/cloud.cfg.d/99-none-omv-setup.cfg

@@ -8,18 +8,14 @@ datasource:
       #cloud-config
       hostname: unvr-nas
 
-      # Setup cmds for open media vault
+      # Setup for OMV
       runcmd:
         - DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -f -y
-        - omv-confdbadm populate
-        - omv-salt deploy run hosts
         - usermod -a -G _ssh debian
+        - rm -rf /etc/systemd/network/first-boot-*.network
+        - omv-salt deploy run hosts systemd-networkd
+        - systemctl restart systemd-networkd
 
-# Setup network for both nics, needed so SFP+ works
+# We will have OMV manage the nics
 network:
-  version: 2
-  ethernets:
-    enp0s1:
-      dhcp4: true
-    enp0s2:
-      dhcp4: true
+  config: disabled

overlay/filesystem/etc/systemd/network/first-boot-enp0s1.network

@@ -0,0 +1,13 @@
+[Match]
+Name=enp0s1
+
+[Network]
+DHCP=ipv4
+LinkLocalAddressing=ipv6
+IPv6AcceptRA=yes
+IPv6PrivacyExtensions=yes
+
+[DHCP]
+RouteMetric=100
+UseMTU=true
+UseDomains=true

overlay/filesystem/etc/systemd/network/first-boot-enp0s2.network

@@ -0,0 +1,13 @@
+[Match]
+Name=enp0s2
+
+[Network]
+DHCP=ipv4
+LinkLocalAddressing=ipv6
+IPv6AcceptRA=yes
+IPv6PrivacyExtensions=yes
+
+[DHCP]
+RouteMetric=100
+UseMTU=true
+UseDomains=true

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

@@ -79,9 +79,13 @@ def __calculate_fan_speed(temp):
             fanspeed = 25
         case _ if temp >= 40 and temp < 50:
             fanspeed = 75
-        case _ if temp >= 50 and temp < 60:
-            fanspeed = 150
-        case _ if temp >= 60 and temp < 70:
+        case _ if temp >= 50 and temp < 55:
+            fanspeed = 100
+        case _ if temp >= 55 and temp < 60:
+            fanspeed = 130
+        case _ if temp >= 60 and temp < 65:
+            fanspeed = 160
+        case _ if temp >= 65 and temp < 70:
             fanspeed = 200
         case _:
             fanspeed = 255

scripts/docker/bootstrap/001-bootstrap

@@ -28,8 +28,8 @@ apt-get -o Dpkg::Options::="--force-confold" -y --allow-downgrades \
     --allow-remove-essential --allow-change-held-packages install cloud-init \
     bsdextrautils git binutils ca-certificates e2fsprogs haveged parted curl \
     locales console-common openssh-server less vim net-tools wireguard-tools \
-    ntpsec u-boot-tools wget u-boot-menu initramfs-tools python3-flask gnupg \
-    libc-ares2
+    ntpsec u-boot-tools wget initramfs-tools python3-flask gnupg libc-ares2  \
+    dfu-util
 
 # Locale gen
 locale-gen
@@ -54,6 +54,16 @@ apt-get --yes --auto-remove --show-upgraded \
     --option DPkg::Options::="--force-confold" \
     install openmediavault openmediavault-md || true # We "fail" all apt cmds from here on til we boot on HW
 
+# Setup NICs for OMV to manage
+jq --null-input --compact-output \
+    "{uuid: \"fa4b1c66-ef79-11e5-87a0-0002b3a176b4\", devicename: \"enp0s1\", method: \"dhcp\", method6: \"auto\"}" | \
+    omv-confdbadm update "conf.system.network.interface" -
+jq --null-input --compact-output \
+    "{uuid: \"fa4b1c66-ef79-11e5-87a0-0002b3a176b4\", devicename: \"enp0s2\", method: \"dhcp\", method6: \"auto\"}" | \
+    omv-confdbadm update "conf.system.network.interface" -
+# Set hostname
+omv-confdbadm update "conf.system.network.dns" "{\"hostname\": \"unvr-nas\"}"
+
 # Cleanup stuff we don't want floating around
 apt-get autoclean || true
 apt-get --purge -y autoremove || true