kernelkit · troglobit · Nov 6, 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/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -9,6 +9,12 @@ All notable changes to the project are documented in this file.
 ### Changes
 
 - Upgrade Linux kernel to 6.12.57 (LTS)
+- 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

diff --git a/doc/networking.md b/doc/networking.md
@@ -996,17 +996,15 @@ default.
     admin@example:/> configure
     admin@example:/config/> edit interface eth0 ipv4
     admin@example:/config/interface/eth0/ipv4/> set address 10.0.1.1 prefix-length 24
-    admin@example:/config/interface/eth0/ipv4/> set autoconf enabled true
+    admin@example:/config/interface/eth0/ipv4/> set autoconf
 	admin@example:/config/interface/eth0/ipv4/> diff
     +interfaces {
     +  interface eth0 {
     +    ipv4 {
     +      address 10.0.1.1 {
     +        prefix-length 24;
     +      }
-    +      autoconf {
-    +        enabled true;
-    +      }
+    +      autoconf;
     +    }
     +  }
     +}
@@ -1022,25 +1020,28 @@ default.
                     ipv6                   ::1/128 (static)
     admin@example:/>
 
-As shown, the link-local IPv4 address is configured with `set autconf
-enabled true`.  The resulting address (169.254.1.3/16) is of type
-*random* ([ietf-ip.yang][2]).
+As shown, the link-local IPv4 address is configured with `set autoconf`.
+The presence of the `autoconf` container enables IPv4 link-local address
+assignment. The resulting address (169.254.1.3/16) is of type *random*
+([ietf-ip.yang][2]).
 
 The IPv4LL client also supports a `request-address` setting which can be
 used to "seed" the client's starting address.  If the address is free it
 will be used, otherwise it falls back to the default algorithm.
 
-    admin@example:/config/interface/eth0/ipv4/> set autoconf request-address 169.254.1.2
+    admin@example:/config/interface/eth0/ipv4/> edit autoconf
+    admin@example:/config/interface/eth0/ipv4/autoconf/> set request-address 169.254.1.2
+    admin@example:/config/interface/eth0/ipv4/autoconf/> leave
 
 
 #### Use of DHCP for IPv4 address assignment
 
 ![Using DHCP for IPv4 address assignment](img/ip-address-example-ipv4-dhcp.svg)
 
     admin@example:/> configure
-    admin@example:/config/> edit dhcp-client
-    admin@example:/config/dhcp-client/> set client-if eth0
-    admin@example:/config/dhcp-client/> leave
+    admin@example:/config/> edit interface eth0 ipv4
+    admin@example:/config/interface/eth0/ipv4/> set dhcp
+    admin@example:/config/interface/eth0/ipv4/> leave
     admin@example:/> show interfaces
     INTERFACE       PROTOCOL   STATE       DATA
     eth0            ethernet   UP          02:00:00:00:00:00
@@ -1053,6 +1054,31 @@ will be used, otherwise it falls back to the default algorithm.
 
 The resulting address (10.1.2.100/24) is of type *dhcp*.
 
+To configure DHCP client options, such as sending a specific hostname to the
+server, you can specify options with values:
+
+```
+admin@example:/> configure
+admin@example:/config/> edit interface eth0 ipv4 dhcp
+admin@example:/config/interface/eth0/ipv4/dhcp/> set option hostname value myhost
+admin@example:/config/interface/eth0/ipv4/dhcp/> show
+option hostname {
+  value myhost;
+}
+admin@example:/config/interface/eth0/ipv4/dhcp/> leave
+admin@example:/>
+```
+
+> [!TIP]
+> The special value `auto` can be used with the hostname option to
+> automatically use the configured system hostname.
+
+Other useful DHCP options include:
+
+- `client-id` - Send a specific client identifier to the server
+- `route-preference` - Set the administrative distance for DHCP-learned routes (default: 5)
+
+For advanced usage with vendor-specific options, see the YANG model.
 
 #### Disabling IPv6 link-local address(es)
 

diff --git a/doc/scripting-sysrepocfg.md b/doc/scripting-sysrepocfg.md
@@ -173,11 +173,13 @@ Enabling DHCPv4 client on interface *e0*, with current default options.
 ```
 ~$ cat /tmp/file.json
 {
-  "infix-dhcp-client:dhcp-client": {
-    "enabled": true,
-    "client-if": [
+  "ietf-interfaces:interfaces": {
+    "interface": [
       {
-        "if-name": "e0"
+        "name": "e0",
+        "ietf-ip:ipv4": {
+          "infix-dhcp-client:dhcp": {}
+        }
       }
     ]
   }
@@ -187,41 +189,27 @@ Enabling DHCPv4 client on interface *e0*, with current default options.
 ~$
 ```
 
-Disabling DHCPv4 client.
+Disabling DHCPv4 client on interface *e0* (remove the dhcp container).
 
 ```
 ~$ cat /tmp/file.json
 {
-  "infix-dhcp-client:dhcp-client": {
-    "enabled": false
-  }
-}
-~$ scp file.json admin@example.local:/tmp/file.json
-~$ ssh admin@example.local 'sysrepocfg -E /tmp/file.json -fjson -d running'
-~$
-```
-
-Configuration for client interface *e0* remains, but does not apply as
-DHCPv4 is disabled.
-
-```
-admin@example:~$ sysrepocfg -X -fjson -d running -x "/infix-dhcp-client:dhcp-client"
-{
-  "infix-dhcp-client:dhcp-client": {
-    "enabled": false,
-    "client-if": [
+  "ietf-interfaces:interfaces": {
+    "interface": [
       {
-        "if-name": "e0"
+        "name": "e0",
+        "ietf-ip:ipv4": {}
       }
     ]
   }
 }
-admin@example:~$
+~$ scp file.json admin@example.local:/tmp/file.json
+~$ ssh admin@example.local 'sysrepocfg -E /tmp/file.json -fjson -d running'
+~$
 ```
 
-To fully remove the DHCPv4 client configuration or a specific
-*client-if* with sysrepocfg, one would need to read out the full
-configuration, remove relevant parts and read back.
+To fully remove the DHCPv4 client configuration, remove the `infix-dhcp-client:dhcp`
+container from the interface's ipv4 configuration.
 
 ## Enable/Disable IPv6
 

diff --git a/package/confd/confd.mk b/package/confd/confd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CONFD_VERSION = 1.5
+CONFD_VERSION = 1.6
 CONFD_SITE_METHOD = local
 CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd
 CONFD_LICENSE = BSD-3-Clause