board/aarch64: use %m modifier in default xPi hostnames

The xPi's usually don't have a VPD so the chassis mac-address probed at
boot is usually null in /run/system.json.  This commit adds a fallbkack
mechanism to populate this field so it can be used for unique hostnames
even on these boards.

Ths ietf-hardware.yang model does not have a notion of physical address,
so we augment one tht is generic enought to be used for other hardware
components than Ethernet, similar to what ietf-interfaces.yang use.

Signed-off-by: Joachim Wiberg <[email protected]>

Author: troglobit

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg

@@ -199,7 +199,7 @@
     }
   },
   "ietf-system:system": {
-    "hostname": "bpi-r3",
+    "hostname": "bpi-%m",
     "ntp": {
       "server": [
         {

board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/factory-config.cfg

@@ -150,7 +150,7 @@
     }
   },
   "ietf-system:system": {
-    "hostname": "r2s",
+    "hostname": "r2s-%m",
     "ntp": {
       "server": [
         {

board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg

@@ -133,7 +133,7 @@
     }
   },
   "ietf-system:system": {
-    "hostname": "rpi",
+    "hostname": "rpi-%m",
     "ntp": {
       "enabled": true,
       "server": [

board/common/rootfs/usr/libexec/infix/init.d/00-probe

@@ -277,8 +277,12 @@ def vpd_inject(out, vpds):
             break
 
 
-def qemu_base_mac():
-    """Find MAC address of first non-loopback interface, subtract with 1"""
+def fallback_base_mac():
+    """Find MAC address of first suitable non-loopback interface.
+
+    Prefers real (globally unique) MACs over locally administered ones.
+    Prioritizes interface types: eth* > wan > wifi* > others.
+    """
     base_path = '/sys/class/net'
     interfaces = []
 
@@ -290,13 +294,41 @@ def qemu_base_mac():
             fn = os.path.join(base_path, iface, 'address')
             with open(fn, 'r', encoding='ascii') as f:
                 mac = f.read().strip()
-            interfaces.append((mac, iface))
+
+            # Check if locally administered (bit 1 of first octet is set)
+            first_byte = int(mac.split(':')[0], 16)
+            is_local = bool(first_byte & 0x02)
+
+            # Prefer: eth* > wan > wifi* > others, then real MACs > local MACs
+            priority = 0
+            if iface.startswith('eth'):
+                priority = 400
+            elif iface == 'wan':
+                priority = 300
+            elif iface.startswith('wifi'):
+                priority = 200
+            else:
+                priority = 100
+
+            # Real MACs get +100 bonus
+            if not is_local:
+                priority += 100
+
+            interfaces.append((priority, iface, mac))
         except FileNotFoundError:
             continue
 
     if interfaces:
-        interfaces.sort()
-        mac  = interfaces[0][0]
+        interfaces.sort(reverse=True)  # Highest priority first
+        return interfaces[0][2]  # Return MAC
+
+    return None
+
+
+def qemu_base_mac():
+    """Find MAC address of first non-loopback interface, subtract with 1"""
+    mac = fallback_base_mac()
+    if mac:
         mac  = int(mac.replace(':', ''), 16)
         mac -= 1
         mac %= 1 << 48
@@ -386,6 +418,11 @@ def probe_dtsystem(out):
         out["factory-password-hash"] = staticpw
 
     vpd_inject(out, vpds)
+
+    # Fallback to interface MAC if VPD doesn't provide one (e.g., SBCs)
+    if not out["mac-address"]:
+        out["mac-address"] = fallback_base_mac()
+
     return 0
 
 

src/confd/yang/confd.inc

@@ -18,7 +18,7 @@ MODULES=(
 	"[email protected]"
 	"[email protected]"
 	"[email protected] -e hardware-state -e hardware-sensor"
-	"infix-hardware@2025-10-18.yang"
+	"infix-hardware@2025-10-30.yang"
 	"[email protected]"
 	"[email protected]"
 	"[email protected]"

src/confd/yang/confd/infix-hardware.yang

@@ -17,8 +17,8 @@ module infix-hardware {
   contact      "[email protected]";
   description  "Vital Product Data augmentation of ieee-hardware and deviations.";
 
-  revision 2025-10-18 {
-    description "Enable sensor support, starting with hwmon temperature sensors.";
+  revision 2025-10-30 {
+    description "Add phys-address leaf for hardware components and enable sensor support.";
     reference "internal";
   }
   revision 2024-04-25 {
@@ -72,6 +72,18 @@ module infix-hardware {
     deviate not-supported;
   }
   augment "/iehw:hardware/iehw:component" {
+    leaf phys-address {
+      type yang:phys-address;
+      config false;
+      description
+        "The physical address of the hardware component. For chassis components,
+         this represents the base MAC address used for the system. This is
+         typically sourced from VPD data on enterprise hardware, or derived from
+         the first physical interface on single-board computers (SBCs) without
+         VPD. May be used as the base for generating addresses for virtual
+         interfaces. For other component types, this could represent various
+         physical layer addresses (e.g., Fibre Channel WWN, InfiniBand GUID).";
+    }
     container vpd-data {
       config false;
       leaf product-name {

…ang/confd/[email protected] …ang/confd/[email protected]src/confd/yang/confd/[email protected] renamed to src/confd/yang/confd/[email protected] src/confd/yang/confd/[email protected] renamed to src/confd/yang/confd/[email protected]

@@ -1703,6 +1703,8 @@ def show_hardware(json):
             print(f"Manufacturer        : {board['mfg-name']}")
         if board.get("serial-num"):
             print(f"Serial Number       : {board['serial-num']}")
+        if board.get("infix-hardware:phys-address"):
+            print(f"Base MAC Address    : {board['infix-hardware:phys-address']}")
         if board.get("hardware-rev"):
             print(f"Hardware Revision   : {board['hardware-rev']}")
 

src/statd/python/cli_pretty/cli_pretty.py

@@ -99,6 +99,10 @@ def motherboard_component(systemjson):
     if systemjson.get("part-number"):
         component["hardware-rev"] = systemjson["part-number"]
 
+    # Add chassis physical address (MAC) if available (from VPD or interface fallback)
+    if systemjson.get("mac-address"):
+        component["infix-hardware:phys-address"] = systemjson["mac-address"]
+
     # Set state - admin-state is "unknown" since chassis cannot be
     # administratively controlled (locked/unlocked)
     component["state"] = {

src/statd/python/yanger/ietf_hardware.py

@@ -6,6 +6,7 @@
         "class": "iana-hardware:chassis",
         "mfg-name": "QEMU",
         "model-name": "VM",
+        "infix-hardware:phys-address": "00:a0:85:00:03:00",
         "state": {
           "admin-state": "unknown",
           "oper-state": "enabled"