kernelkit · troglobit · Nov 2, 2025 · Nov 2, 2025 · Nov 2, 2025 · Nov 2, 2025
diff --git a/...d/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg b/...d/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg
@@ -99,7 +99,20 @@
       {
         "name": "wan",
         "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {}
+        "ietf-ip:ipv6": {},
+        "ietf-ip:ipv4": {
+          "infix-dhcp-client:dhcp": {
+            "option": [
+              {"id": "ntp-server"},
+              {"id": "broadcast"},
+              {"id": "domain"},
+              {"id": "hostname"},
+              {"id": "dns-server"},
+              {"id": "router"},
+              {"id": "netmask"}
+            ]
+          }
+        }
       },
       {
         "name": "wifi0",
@@ -221,36 +234,6 @@
     },
     "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
   },
-  "infix-dhcp-client:dhcp-client": {
-    "client-if": [
-      {
-        "if-name": "wan",
-        "option": [
-          {
-            "id": "ntp-server"
-          },
-          {
-            "id": "broadcast"
-          },
-          {
-            "id": "domain"
-          },
-          {
-            "id": "hostname"
-          },
-          {
-            "id": "dns-server"
-          },
-          {
-            "id": "router"
-          },
-          {
-            "id": "netmask"
-          }
-        ]
-      }
-    ]
-  },
   "infix-dhcp-server:dhcp-server": {
     "option": [
       {
@@ -311,7 +294,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.5"
+    "version": "1.6"
   },
   "infix-services:mdns": {
     "enabled": true

diff --git a/...ndlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/factory-config.cfg b/...ndlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/factory-config.cfg
@@ -58,7 +58,20 @@
       {
         "name": "wan",
         "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {}
+        "ietf-ip:ipv6": {},
+        "ietf-ip:ipv4": {
+          "infix-dhcp-client:dhcp": {
+            "option": [
+              {"id": "ntp-server"},
+              {"id": "broadcast"},
+              {"id": "domain"},
+              {"id": "hostname"},
+              {"id": "dns-server"},
+              {"id": "router"},
+              {"id": "netmask"}
+            ]
+          }
+        }
       }
     ]
   },
@@ -172,36 +185,6 @@
     },
     "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
   },
-  "infix-dhcp-client:dhcp-client": {
-    "client-if": [
-      {
-        "if-name": "wan",
-        "option": [
-          {
-            "id": "ntp-server"
-          },
-          {
-            "id": "broadcast"
-          },
-          {
-            "id": "domain"
-          },
-          {
-            "id": "hostname"
-          },
-          {
-            "id": "dns-server"
-          },
-          {
-            "id": "router"
-          },
-          {
-            "id": "netmask"
-          }
-        ]
-      }
-    ]
-  },
   "infix-dhcp-server:dhcp-server": {
     "option": [
       {
@@ -262,7 +245,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.5"
+    "version": "1.6"
   },
   "infix-services:mdns": {
     "enabled": true

diff --git a/...4/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg b/...4/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg
@@ -37,7 +37,20 @@
       },
       {
         "name": "eth0",
-        "type": "infix-if-type:ethernet"
+        "type": "infix-if-type:ethernet",
+        "ietf-ip:ipv4": {
+          "infix-dhcp-client:dhcp": {
+            "option": [
+              {"id": "netmask"},
+              {"id": "broadcast"},
+              {"id": "router"},
+              {"id": "domain"},
+              {"id": "hostname"},
+              {"id": "dns-server"},
+              {"id": "ntp-server"}
+            ]
+          }
+        }
       },
       {
         "name": "wifi0",
@@ -157,38 +170,8 @@
     },
     "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
   },
-  "infix-dhcp-client:dhcp-client": {
-    "client-if": [
-      {
-        "if-name": "eth0",
-        "option": [
-          {
-            "id": "netmask"
-          },
-          {
-            "id": "broadcast"
-          },
-          {
-            "id": "router"
-          },
-          {
-            "id": "domain"
-          },
-          {
-            "id": "hostname"
-          },
-          {
-            "id": "dns-server"
-          },
-          {
-            "id": "ntp-server"
-          }
-        ]
-      }
-    ]
-  },
   "infix-meta:meta": {
-    "version": "1.5"
+    "version": "1.6"
   },
   "infix-services:mdns": {
     "enabled": true

diff --git a/board/common/rootfs/etc/fstab b/board/common/rootfs/etc/fstab
@@ -15,9 +15,9 @@ cfgfs		/config		configfs	nofail,noauto		0	0
 # The chosen backing storage for the overlays placed on /cfg, /etc,
 # /home, /root, and /var, are determined dynamically by /usr/libexec/infix/mnt
 # depending on the available devices.
-mnttmp		/mnt/tmp	tmpfs	defaults				0	0
-LABEL=aux	/mnt/aux	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-LABEL=var	/mnt/var	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-LABEL=cfg	/mnt/cfg	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-hostfs		/mnt/host	9p	cache=none,msize=16384,noauto		0	0
-/usr/libexec/infix/mnt#	/cfg	helper	none					0	0
+mnttmp		/mnt/tmp	tmpfs	defaults					0	0
+LABEL=aux	/mnt/aux	ext2	noatime,nodiratime,noauto,errors=remount-ro	0	0
+LABEL=var	/mnt/var	ext4	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+LABEL=cfg	/mnt/cfg	ext4	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+hostfs		/mnt/host	9p	cache=none,msize=16384,noauto			0	0
+/usr/libexec/infix/mnt#	/cfg	helper	none						0	0
diff --git a/board/common/rootfs/usr/libexec/infix/mnt b/board/common/rootfs/usr/libexec/infix/mnt
@@ -44,12 +44,15 @@ check_factory()
 factory_reset()
 {
     find /sys/class/leds/ -type l -exec sh -c 'echo 100 > $0/brightness' {} \;
-    logger $opt -p user.crit -t "$nm" "Resetting to factory defaults."
+    print_start "Resetting to factory defaults."
+    logger $opt -p user.notice -t "$nm" "Resetting to factory defaults."
 
     rm -rf /mnt/cfg/* /mnt/var/*
-
-    logger $opt -p user.crit -t "$nm" "Factory reset complete."
     sync
+
+    logger $opt -p user.notice -t "$nm" "Factory reset complete."
+    print_end 0 "Factory reset complete."
+    print_restore
 }
 
 is_mmc()
@@ -105,15 +108,18 @@ find_partition_by_label()
 	esac
 
 	disk="/dev/$devname"
+
+	#
+	# 1. Try GPT/MBR partition label using sgdisk
+	#
 	result=$(sgdisk -p "$disk" 2>/dev/null | awk -v label="$label" -v devname="$devname" '
-	    /^  *[0-9]/ {
+	    /^ *[0-9]/ {
 		if ($7 == label) {
-		    if (devname ~ /^(mmcblk|nvme|loop)/) {
-			print devname "p" $1
-		    } else {
-			print devname $1
-		    }
-		    exit 0
+		    if (devname ~ /^(mmcblk|nvme|loop)/)
+			print devname "p" $1;
+		    else
+			print devname $1;
+		    exit 0;
 		}
 	    }
 	')
@@ -122,7 +128,30 @@ find_partition_by_label()
 	    echo "$result"
 	    return 0
 	fi
+
+	#
+	# 2. Fallback: Check if the whole disk is an ext4/ext2/ext3 filesystem
+	#
+
+	# Check for ext4/ext2/ext3 magic number (0xEF53) at offset 1080 (1024+56).
+	magic_number=$(dd if="$disk" bs=1 skip=1080 count=2 2>/dev/null | od -t x2 -A n | tr -d ' \n')
+
+	# Check for both Little-Endian ('53ef') and Big-Endian ('ef53') interpretations of 0xEF53.
+	# This supports bi-endian architectures like MIPS that may run in BE mode,
+	# as well as the LE mode which is standard for RISC-V and ext filesystems.
+	if [ "$magic_number" = "ef53" ] || [ "$magic_number" = "53ef" ]; then
+
+	    # Read the volume label from offset 1144 (1024+120)
+	    fslabel=$(dd if="$disk" bs=1 skip=1144 count=16 2>/dev/null | tr -d '\000')
+	    logger $opt -p user.notice -t "$nm" "Found label $fslabel on disk $disk ..."
+
+	    if [ "$fslabel" = "$label" ]; then
+		echo "$devname"
+		return 0
+	    fi
+	fi
     done
+
     return 1
 }
 
@@ -273,6 +302,9 @@ mount_rw()
     # If something is already setup, leave it be.
     mountpoint -q "/$1" && return 0
 
+    # If partition doesn't exist (var is optional), signal caller.
+    find_partition_by_label "$1" >/dev/null || return 1
+
     # Check if /var has been resized to fill the sdcard/eMMC
     if [ "$1" = "var" ] && is_mmc; then
 	if [ -f /mnt/aux/resized ] || [ -f /mnt/aux/resized.failed ]; then
@@ -289,8 +321,10 @@ mount_rw()
 
     # TODO: Also look for UBI partitions
 
-    # 
-    tune2fs -c 0 -i 0 LABEL="$1" 2>/dev/null 
+    # Disable periodic fsck, yet keeping safety checks on ext4
+    if grep "LABEL=$label" /etc/fstab |grep -q ext4; then
+	tune2fs -c 0 -i 0 LABEL="$1" 2>/dev/null
+    fi
     mount LABEL="$1" 2>/dev/null && return 0
 
     return 1

diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -8,6 +8,12 @@ All notable changes to the project are documented in this file.
 
 ### Changes
 
+- The DHCP client configuration has moved from `/infix-dhcp-client:dhcp-client`
+  to `/interfaces/interface[name]/ipv4/infix-dhcp-client:dhcp`, issue #1109.
+  The configuration is automatically migrated on upgrade.  The DHCP client is
+  now enabled using a presence container instead of a separate `enabled` leaf
+- The `enabled` nore for IPv4 autoconf (ZeroConf) has been dropped, `autoconf`
+  is now a presence container.  Configuration automatically migrated on upgrade
 - Improvements to `sdcard.img` generation, useful for developers mostly:
    - The NanoPi R2S bootloader is now automatically built and uploaded to
      the [`latest-boot` release][lastest-boot] tag