Merge pull request #1440 from kernelkit/default-route-at-boot

troglobit · web-flow · commit b9cbbb053dcd · 2026-03-12T13:49:34.000+01:00
Fix missing default route at boot

Signed-off-by: Joachim Wiberg &lt;troglobit@gmail.com&gt;
diff --git a/board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg b/board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg
@@ -21,21 +21,21 @@
       {
         "name": "radio0",
         "class": "infix-hardware:wifi",
-	"infix-hardware:wifi-radio": {
-	  "country-code": "DE",
-	  "band": "2.4GHz",
-	  "channel": "auto"
-	 }
-     },
-     {
-	"name": "radio1",
-	"class": "infix-hardware:wifi",
-	"infix-hardware:wifi-radio": {
-	  "country-code": "DE",
+        "infix-hardware:wifi-radio": {
+          "country-code": "DE",
+          "band": "2.4GHz",
+          "channel": "auto"
+        }
+      },
+      {
+        "name": "radio1",
+        "class": "infix-hardware:wifi",
+        "infix-hardware:wifi-radio": {
+          "country-code": "DE",
           "band": "5GHz",
           "channel": "auto"
+        }
       }
-    }
     ]
   },
   "ietf-interfaces:interfaces": {
@@ -130,7 +130,8 @@
                 "id": "domain"
               },
               {
-                "id": "hostname"
+                "id": "hostname",
+                "value": "auto"
               },
               {
                 "id": "dns-server"
@@ -179,7 +180,7 @@
             }
           }
         },
-	"infix-interfaces:bridge-port": {
+        "infix-interfaces:bridge-port": {
           "bridge": "br0"
         }
       },
@@ -195,7 +196,7 @@
             }
           }
         },
-       "infix-interfaces:bridge-port": {
+        "infix-interfaces:bridge-port": {
           "bridge": "br0"
         }
       }
diff --git a/board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3mini/etc/factory-config.cfg b/board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3mini/etc/factory-config.cfg
@@ -21,21 +21,21 @@
       {
         "name": "radio0",
         "class": "infix-hardware:wifi",
-	"infix-hardware:wifi-radio": {
-	  "country-code": "DE",
-	  "band": "2.4GHz",
-	  "channel": "auto"
-	 }
-     },
-     {
-	"name": "radio1",
-	"class": "infix-hardware:wifi",
-	"infix-hardware:wifi-radio": {
-	  "country-code": "DE",
+        "infix-hardware:wifi-radio": {
+          "country-code": "DE",
+          "band": "2.4GHz",
+          "channel": "auto"
+        }
+      },
+      {
+        "name": "radio1",
+        "class": "infix-hardware:wifi",
+        "infix-hardware:wifi-radio": {
+          "country-code": "DE",
           "band": "5GHz",
           "channel": "auto"
+        }
       }
-    }
     ]
   },
   "ietf-interfaces:interfaces": {
@@ -96,7 +96,8 @@
                 "id": "domain"
               },
               {
-                "id": "hostname"
+                "id": "hostname",
+                "value": "auto"
               },
               {
                 "id": "dns-server"
@@ -145,7 +146,7 @@
             }
           }
         },
-	"infix-interfaces:bridge-port": {
+        "infix-interfaces:bridge-port": {
           "bridge": "br0"
         }
       },
@@ -161,7 +162,7 @@
             }
           }
         },
-       "infix-interfaces:bridge-port": {
+        "infix-interfaces:bridge-port": {
           "bridge": "br0"
         }
       }
diff --git a/board/aarch64/bananapi-bpi-r64/rootfs/usr/share/product/bananapi,bpi-r64/etc/factory-config.cfg b/board/aarch64/bananapi-bpi-r64/rootfs/usr/share/product/bananapi,bpi-r64/etc/factory-config.cfg
@@ -14,11 +14,11 @@
       {
         "name": "radio0",
         "class": "infix-hardware:wifi",
-	"infix-hardware:wifi-radio": {
-	  "country-code": "DE",
-	  "band": "2.4GHz",
-	  "channel": "auto"
-	}
+        "infix-hardware:wifi-radio": {
+          "country-code": "DE",
+          "band": "2.4GHz",
+          "channel": "auto"
+        }
       }
     ]
   },
@@ -104,7 +104,8 @@
                 "id": "domain"
               },
               {
-                "id": "hostname"
+                "id": "hostname",
+                "value": "auto"
               },
               {
                 "id": "dns-server"
@@ -153,7 +154,7 @@
             }
           }
         },
-	"infix-interfaces:bridge-port": {
+        "infix-interfaces:bridge-port": {
           "bridge": "br0"
         }
       }
diff --git a/board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/factory-config.cfg b/board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/factory-config.cfg
@@ -71,7 +71,8 @@
                 "id": "domain"
               },
               {
-                "id": "hostname"
+                "id": "hostname",
+                "value": "auto"
               },
               {
                 "id": "dns-server"
diff --git a/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg b/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg
@@ -62,7 +62,8 @@
                 "id": "domain"
               },
               {
-                "id": "hostname"
+                "id": "hostname",
+                "value": "auto"
               },
               {
                 "id": "dns-server"
diff --git a/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,400/etc/factory-config.cfg b/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,400/etc/factory-config.cfg
@@ -76,7 +76,8 @@
                 "id": "domain"
               },
               {
-                "id": "hostname"
+                "id": "hostname",
+                "value": "auto"
               },
               {
                 "id": "dns-server"
diff --git a/board/arm/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg b/board/arm/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg
@@ -54,7 +54,8 @@
                 "id": "domain"
               },
               {
-                "id": "hostname"
+                "id": "hostname",
+                "value": "auto"
               },
               {
                 "id": "dns-server"
diff --git a/board/common/rootfs/etc/dnsmasq.conf b/board/common/rootfs/etc/dnsmasq.conf
@@ -2,6 +2,7 @@
 # managed by openresolv.  DHCP lease, VPN tunnel establishment,
 # and similar events feed servers and configuration to dnsmasq.
 domain-needed
+dhcp-authoritative
 
 # Allow configuration and cache clear over D-Bus
 enable-dbus
@@ -10,8 +11,6 @@ enable-dbus
 #dhcp-option=option:netmask
 #dhcp-option=28			# option:broadcast
 #dhcp-option=option:domain-name
-dhcp-option=option:router
-dhcp-option=option:dns-server
 dhcp-option=12			# option:hostname
 
 # Generated by openresolv
diff --git a/board/common/rootfs/etc/netd/conf.d/.empty b/board/common/rootfs/etc/netd/conf.d/.empty
diff --git a/board/common/rootfs/usr/share/udhcpc/default.script b/board/common/rootfs/usr/share/udhcpc/default.script
@@ -7,7 +7,7 @@ ACTION="$1"
 IP_CACHE="/var/lib/misc/${interface}.cache"
 RESOLV_CONF="/run/resolvconf/interfaces/${interface}.conf"
 NTPFILE="/run/chrony/dhcp-sources.d/${interface}.sources"
-NAME="/etc/netd/conf.d/${interface}-dhcp.conf"
+NAME="/etc/net.d/${interface}-dhcp.conf"
 NEXT="${NAME}+"
 
 [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
@@ -118,17 +118,13 @@ set_dhcp_routes()
     # Reduce changes needed by comparing with previous route(s)
     cmp -s "$NAME" "$NEXT" && return
     mv "$NEXT" "$NAME"
-
-    initctl reload netd
 }
 
 clr_dhcp_routes()
 {
     log "deleting DHCP routes"
     [ -f "$NAME" ] || return
     rm "$NAME"
-
-    initctl reload netd
 }
 
 clr_dhcp_addresses()
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -32,6 +32,18 @@ All notable changes to the project are documented in this file.
 
 ### Fixes
 
+- Fix #1438: default route from DHCP client not set at boot, regression
+  introduced in v26.02.0
+- Fix DHCP client not sending hostname to server (e.g. for `dnsmasq` lease
+  registration).  All board factory configs had the hostname option without
+  `value: auto`, so `udhcpc` only requested the option instead of sending it.
+  Setting up a DHCP client manually was not affected.  Also, the hostname
+  format string (e.g. `rpi-%m`) was not expanded to the actual system hostname
+  before being passed to `udhcpc`
+- Fix dnsmasq logging spurious "Ignoring duplicate dhcp-option" warnings for
+  options 3 (router) and 6 (dns-server) on every DHCP transaction.  Add
+  `dhcp-authoritative` so clients with unexpired leases are not NAKed after
+  a router crash or factory reset that clears the lease database
 - Fix #1387: `infix.local` now resolves to exactly one device per LAN.  Previously
   all Infix devices claimed both `hostname.local` and `infix.local`, causing avahi
   to append `#2`, `#3` suffixes to the shared alias on busy networks.  Assignment
diff --git a/package/netd/Config.in b/package/netd/Config.in
@@ -2,9 +2,10 @@ config BR2_PACKAGE_NETD
 	bool "netd"
 	select BR2_PACKAGE_LIBITE
 	select BR2_PACKAGE_LIBCONFUSE
+	select BR2_PACKAGE_LIBEV
 	help
 	  Network route daemon. Manages static routes and RIP routing.
-	  Reads configuration from /etc/netd/conf.d/*.conf.
+	  Reads configuration from /etc/net.d/*.conf.
 
 	  With FRR: Full routing via gRPC, vtysh, or frr.conf.
 	  Without FRR: Standalone Linux backend via rtnetlink.
diff --git a/package/netd/netd.mk b/package/netd/netd.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-NETD_VERSION = 1.0
+NETD_VERSION = 1.1.0
 NETD_SITE_METHOD = local
 NETD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/netd
 NETD_LICENSE = BSD-3-Clause
 NETD_LICENSE_FILES = LICENSE
 NETD_REDISTRIBUTE = NO
-NETD_DEPENDENCIES = libite libconfuse jansson
+NETD_DEPENDENCIES = libite libconfuse jansson libev
 NETD_AUTORECONF = YES
 
 NETD_CONF_ENV = CFLAGS="$(INFIX_CFLAGS)"
diff --git a/src/confd/src/dhcp-common.c b/src/confd/src/dhcp-common.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
 #include <ctype.h>
+#include <limits.h>
 #include <pwd.h>
 #include <sys/utsname.h>
 #include <sys/sysinfo.h>
@@ -70,21 +71,20 @@ int dhcp_option_lookup(const struct lyd_node *id)
 
 char *dhcp_hostname(struct lyd_node *cfg, char *str, size_t len)
 {
+	char hostname[HOST_NAME_MAX + 1] = { 0 };
 	struct lyd_node *node;
-	const char *hostname;
-	char *ptr;
+	const char *fmt;
 
 	node = lydx_get_xpathf(cfg, "/ietf-system:system/hostname");
 	if (!node)
 		return NULL;
 
-	hostname = lyd_get_value(node);
-	if (!hostname || hostname[0] == 0)
+	fmt = lyd_get_value(node);
+	if (!fmt || !fmt[0])
 		return NULL;
 
-	ptr = strchr(hostname, '.');
-	if (ptr)
-		*ptr = 0;
+	if (hostnamefmt(&confd, fmt, hostname, sizeof(hostname), NULL, 0) || !hostname[0])
+		return NULL;
 
 	snprintf(str, len, "-x hostname:%s ", hostname);
 
@@ -262,10 +262,12 @@ int ifchange_cand_infer_dhcp(sr_session_ctx_t *session, const char *xpath)
 
 	/* Check if options already exist */
 	err = srx_nitems(session, &cnt, "%s/option", path);
-	if (err || cnt) {
-		ERROR("%s(): no %s/options err %d cnt %zu", __func__, path, err, cnt);
+	if (err) {
+		ERROR("%s(): failed querying %s/option: %d", __func__, path, err);
 		goto out;
 	}
+	if (cnt)
+		goto out;
 
 	/* Infer options based on IPv4 or IPv6 */
 	if (strstr(path, ":ipv4/"))
diff --git a/src/confd/src/routing.c b/src/confd/src/routing.c
@@ -8,7 +8,7 @@
 
 #define XPATH_BASE_ "/ietf-routing:routing/control-plane-protocols/control-plane-protocol"
 #define XPATH_OSPF_ XPATH_BASE_ "/ietf-ospf:ospf"
-#define NETD_CONF "/etc/netd/conf.d/confd.conf"
+#define NETD_CONF "/etc/net.d/confd.conf"
 #define NETD_CONF_NEXT NETD_CONF "+"
 #define NETD_CONF_PREV NETD_CONF "-"
 #define OSPFD_CONF "/etc/frr/ospfd.conf"
diff --git a/src/netd/Makefile.am b/src/netd/Makefile.am
@@ -6,7 +6,7 @@ netd_SOURCES        = src/netd.c src/netd.h src/config.c src/config.h
 netd_CPPFLAGS       = -D_DEFAULT_SOURCE -D_GNU_SOURCE -I$(srcdir)/src
 netd_CFLAGS         = -W -Wall -Wextra
 netd_CFLAGS        += $(libite_CFLAGS) $(libconfuse_CFLAGS) $(jansson_CFLAGS)
-netd_LDADD          = $(libite_LIBS) $(libconfuse_LIBS) $(jansson_LIBS)
+netd_LDADD          = $(libite_LIBS) $(libconfuse_LIBS) $(jansson_LIBS) $(EV_LIBS)
 
 # Backend selection: FRR gRPC, FRR frr.conf, or Linux kernel
 if HAVE_FRR_GRPC
diff --git a/src/netd/README.md b/src/netd/README.md
@@ -60,7 +60,7 @@ make install
 
 netd uses [libconfuse](https://github.com/martinh/libconfuse) for configuration parsing, providing a clean and structured format.
 
-Configuration files are placed in `/etc/netd/conf.d/` with the `.conf` extension. Files are processed in alphabetical order.
+Configuration files are placed in `/etc/net.d/` with the `.conf` extension. Files are processed in alphabetical order.
 
 ### Configuration Format
 
@@ -219,10 +219,10 @@ rip {
 
 ### Configuration Files
 
-Configuration files must be placed in `/etc/netd/conf.d/` with the `.conf` extension:
+Configuration files must be placed in `/etc/net.d/` with the `.conf` extension:
 
 ```bash
-/etc/netd/conf.d/
+/etc/net.d/
 ├── 10-static.conf      # Static routes
 ├── 20-rip.conf         # RIP configuration
 └── 99-local.conf       # Local overrides
@@ -256,7 +256,7 @@ netd validates configuration on reload. Check syslog for errors.
 
 ```
 ┌─────────┐
-│  confd  │ Writes /etc/netd/conf.d/confd.conf
+│  confd  │ Writes /etc/net.d/confd.conf
 └────┬────┘
      │ SIGHUP
      ▼
diff --git a/src/netd/configure.ac b/src/netd/configure.ac
diff --git a/src/netd/src/netd.c b/src/netd/src/netd.c
diff --git a/src/netd/src/netd.h b/src/netd/src/netd.h

Original file line number	Diff line number	Diff line change
`@@ -21,21 +21,21 @@`
`21`	`21`	`{`
`22`	`22`	`"name": "radio0",`
`23`	`23`	`"class": "infix-hardware:wifi",`
`24`		`- "infix-hardware:wifi-radio": {`
`25`		`- "country-code": "DE",`
`26`		`- "band": "2.4GHz",`
`27`		`- "channel": "auto"`
`28`		`- }`
`29`		`- },`
`30`		`- {`
`31`		`- "name": "radio1",`
`32`		`- "class": "infix-hardware:wifi",`
`33`		`- "infix-hardware:wifi-radio": {`
`34`		`- "country-code": "DE",`
	`24`	`+ "infix-hardware:wifi-radio": {`
	`25`	`+ "country-code": "DE",`
	`26`	`+ "band": "2.4GHz",`
	`27`	`+ "channel": "auto"`
	`28`	`+ }`
	`29`	`+ },`
	`30`	`+ {`
	`31`	`+ "name": "radio1",`
	`32`	`+ "class": "infix-hardware:wifi",`
	`33`	`+ "infix-hardware:wifi-radio": {`
	`34`	`+ "country-code": "DE",`
`35`	`35`	`"band": "5GHz",`
`36`	`36`	`"channel": "auto"`
	`37`	`+ }`
`37`	`38`	`}`
`38`		`- }`
`39`	`39`	`]`
`40`	`40`	`},`
`41`	`41`	`"ietf-interfaces:interfaces": {`
`@@ -130,7 +130,8 @@`
`130`	`130`	`"id": "domain"`
`131`	`131`	`},`
`132`	`132`	`{`
`133`		`- "id": "hostname"`
	`133`	`+ "id": "hostname",`
	`134`	`+ "value": "auto"`
`134`	`135`	`},`
`135`	`136`	`{`
`136`	`137`	`"id": "dns-server"`
`@@ -179,7 +180,7 @@`
`179`	`180`	`}`
`180`	`181`	`}`
`181`	`182`	`},`
`182`		`- "infix-interfaces:bridge-port": {`
	`183`	`+ "infix-interfaces:bridge-port": {`
`183`	`184`	`"bridge": "br0"`
`184`	`185`	`}`
`185`	`186`	`},`
`@@ -195,7 +196,7 @@`
`195`	`196`	`}`
`196`	`197`	`}`
`197`	`198`	`},`
`198`		`- "infix-interfaces:bridge-port": {`
	`199`	`+ "infix-interfaces:bridge-port": {`
`199`	`200`	`"bridge": "br0"`
`200`	`201`	`}`
`201`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@`
`14`	`14`	`{`
`15`	`15`	`"name": "radio0",`
`16`	`16`	`"class": "infix-hardware:wifi",`
`17`		`- "infix-hardware:wifi-radio": {`
`18`		`- "country-code": "DE",`
`19`		`- "band": "2.4GHz",`
`20`		`- "channel": "auto"`
`21`		`- }`
	`17`	`+ "infix-hardware:wifi-radio": {`
	`18`	`+ "country-code": "DE",`
	`19`	`+ "band": "2.4GHz",`
	`20`	`+ "channel": "auto"`
	`21`	`+ }`
`22`	`22`	`}`
`23`	`23`	`]`
`24`	`24`	`},`
`@@ -104,7 +104,8 @@`
`104`	`104`	`"id": "domain"`
`105`	`105`	`},`
`106`	`106`	`{`
`107`		`- "id": "hostname"`
	`107`	`+ "id": "hostname",`
	`108`	`+ "value": "auto"`
`108`	`109`	`},`
`109`	`110`	`{`
`110`	`111`	`"id": "dns-server"`
`@@ -153,7 +154,7 @@`
`153`	`154`	`}`
`154`	`155`	`}`
`155`	`156`	`},`
`156`		`- "infix-interfaces:bridge-port": {`
	`157`	`+ "infix-interfaces:bridge-port": {`
`157`	`158`	`"bridge": "br0"`
`158`	`159`	`}`
`159`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@`
`71`	`71`	`"id": "domain"`
`72`	`72`	`},`
`73`	`73`	`{`
`74`		`- "id": "hostname"`
	`74`	`+ "id": "hostname",`
	`75`	`+ "value": "auto"`
`75`	`76`	`},`
`76`	`77`	`{`
`77`	`78`	`"id": "dns-server"`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,8 @@`
`62`	`62`	`"id": "domain"`
`63`	`63`	`},`
`64`	`64`	`{`
`65`		`- "id": "hostname"`
	`65`	`+ "id": "hostname",`
	`66`	`+ "value": "auto"`
`66`	`67`	`},`
`67`	`68`	`{`
`68`	`69`	`"id": "dns-server"`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@`
`76`	`76`	`"id": "domain"`
`77`	`77`	`},`
`78`	`78`	`{`
`79`		`- "id": "hostname"`
	`79`	`+ "id": "hostname",`
	`80`	`+ "value": "auto"`
`80`	`81`	`},`
`81`	`82`	`{`
`82`	`83`	`"id": "dns-server"`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@`
`54`	`54`	`"id": "domain"`
`55`	`55`	`},`
`56`	`56`	`{`
`57`		`- "id": "hostname"`
	`57`	`+ "id": "hostname",`
	`58`	`+ "value": "auto"`
`58`	`59`	`},`
`59`	`60`	`{`
`60`	`61`	`"id": "dns-server"`