From 773aab6ec1e4c2dc960ba6f8567c290d301399a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Tue, 16 Dec 2025 18:27:52 +0100 Subject: [PATCH] factory-config.cfg: Update all static factory-config.cfg to the new syntax in ietf-netconf --- .../etc/factory-config.cfg | 41 +++++++--- .../bananapi,bpi-r3/etc/factory-config.cfg | 82 +++++++++++++------ .../etc/factory-config.cfg | 81 ++++++++++++------ .../etc/factory-config.cfg | 41 +++++++--- 4 files changed, 172 insertions(+), 73 deletions(-) diff --git a/board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg b/board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg index d7a28efe..fcc963b9 100644 --- a/board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg +++ b/board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg @@ -41,14 +41,31 @@ "ietf-ip:ipv4": { "infix-dhcp-client:dhcp": { "option": [ - {"id": "netmask"}, - {"id": "broadcast"}, - {"id": "router"}, - {"id": "domain"}, - {"id": "hostname"}, - {"id": "dns-server"}, - {"id": "ntp-server"}, - {"id": "vendor-class", "value": "Raspberry Pi 2 Model B"} + { + "id": "netmask" + }, + { + "id": "broadcast" + }, + { + "id": "router" + }, + { + "id": "domain" + }, + { + "id": "hostname" + }, + { + "id": "dns-server" + }, + { + "id": "ntp-server" + }, + { + "id": "vendor-class", + "value": "Raspberry Pi 2 Model B" + } ] } } @@ -122,7 +139,11 @@ "name": "default-ssh", "ssh": { "tcp-server-parameters": { - "local-address": "::" + "local-bind": [ + { + "local-address": "::" + } + ] }, "ssh-server-parameters": { "server-identity": { @@ -168,7 +189,7 @@ "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo=" }, "infix-meta:meta": { - "version": "1.6" + "version": "1.7" }, "infix-services:mdns": { "enabled": true 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 index 259cc996..e23da3d7 100644 --- 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 @@ -102,24 +102,49 @@ "ietf-ip:ipv4": { "infix-dhcp-client:dhcp": { "option": [ - {"id": "ntp-server"}, - {"id": "broadcast"}, - {"id": "domain"}, - {"id": "hostname"}, - {"id": "dns-server"}, - {"id": "router"}, - {"id": "netmask"}, - {"id": "vendor-class", "value": "Banana Pi BPI-R3"} + { + "id": "ntp-server" + }, + { + "id": "broadcast" + }, + { + "id": "domain" + }, + { + "id": "hostname" + }, + { + "id": "dns-server" + }, + { + "id": "router" + }, + { + "id": "netmask" + }, + { + "id": "vendor-class", + "value": "Banana Pi BPI-R3" + } ] } }, "ietf-ip:ipv6": { "infix-dhcpv6-client:dhcp": { "option": [ - {"id": "ntp-server"}, - {"id": "client-fqdn"}, - {"id": "domain-search"}, - {"id": "dns-server"} + { + "id": "ntp-server" + }, + { + "id": "client-fqdn" + }, + { + "id": "domain-search" + }, + { + "id": "dns-server" + } ] } } @@ -135,18 +160,18 @@ ] }, "ietf-keystore:keystore": { - "asymmetric-keys": { - "asymmetric-key": [ - { - "name": "genkey", - "public-key-format": "infix-crypto-types:ssh-public-key-format", - "public-key": "", - "private-key-format": "infix-crypto-types:rsa-private-key-format", - "cleartext-private-key": "", - "certificates": {} - } - ] + "asymmetric-keys": { + "asymmetric-key": [ + { + "name": "genkey", + "public-key-format": "infix-crypto-types:ssh-public-key-format", + "public-key": "", + "private-key-format": "infix-crypto-types:rsa-private-key-format", + "cleartext-private-key": "", + "certificates": {} } + ] + } }, "ietf-netconf-acm:nacm": { "enable-nacm": true, @@ -201,7 +226,11 @@ "name": "default-ssh", "ssh": { "tcp-server-parameters": { - "local-address": "::" + "local-bind": [ + { + "local-address": "::" + } + ] }, "ssh-server-parameters": { "server-identity": { @@ -293,7 +322,7 @@ "policy": [ { "name": "lan-to-wan", - "action": "accept", + "action": "accept", "ingress": [ "lan" ], @@ -305,7 +334,7 @@ ] }, "infix-meta:meta": { - "version": "1.6" + "version": "1.7" }, "infix-services:mdns": { "enabled": true @@ -341,4 +370,3 @@ } } } - 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 index d300780d..a76a2291 100644 --- 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 @@ -61,24 +61,49 @@ "ietf-ip:ipv4": { "infix-dhcp-client:dhcp": { "option": [ - {"id": "ntp-server"}, - {"id": "broadcast"}, - {"id": "domain"}, - {"id": "hostname"}, - {"id": "dns-server"}, - {"id": "router"}, - {"id": "netmask"}, - {"id": "vendor-class", "value": "NanoPi R2S"} + { + "id": "ntp-server" + }, + { + "id": "broadcast" + }, + { + "id": "domain" + }, + { + "id": "hostname" + }, + { + "id": "dns-server" + }, + { + "id": "router" + }, + { + "id": "netmask" + }, + { + "id": "vendor-class", + "value": "NanoPi R2S" + } ] } }, "ietf-ip:ipv6": { "infix-dhcpv6-client:dhcp": { "option": [ - {"id": "ntp-server"}, - {"id": "client-fqdn"}, - {"id": "domain-search"}, - {"id": "dns-server"} + { + "id": "ntp-server" + }, + { + "id": "client-fqdn" + }, + { + "id": "domain-search" + }, + { + "id": "dns-server" + } ] } } @@ -86,18 +111,18 @@ ] }, "ietf-keystore:keystore": { - "asymmetric-keys": { - "asymmetric-key": [ - { - "name": "genkey", - "public-key-format": "infix-crypto-types:ssh-public-key-format", - "public-key": "", - "private-key-format": "infix-crypto-types:rsa-private-key-format", - "cleartext-private-key": "", - "certificates": {} - } - ] + "asymmetric-keys": { + "asymmetric-key": [ + { + "name": "genkey", + "public-key-format": "infix-crypto-types:ssh-public-key-format", + "public-key": "", + "private-key-format": "infix-crypto-types:rsa-private-key-format", + "cleartext-private-key": "", + "certificates": {} } + ] + } }, "ietf-netconf-acm:nacm": { "enable-nacm": true, @@ -152,7 +177,11 @@ "name": "default-ssh", "ssh": { "tcp-server-parameters": { - "local-address": "::" + "local-bind": [ + { + "local-address": "::" + } + ] }, "ssh-server-parameters": { "server-identity": { @@ -244,7 +273,7 @@ "policy": [ { "name": "lan-to-wan", - "action": "accept", + "action": "accept", "ingress": [ "lan" ], @@ -256,7 +285,7 @@ ] }, "infix-meta:meta": { - "version": "1.6" + "version": "1.7" }, "infix-services:mdns": { "enabled": true 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 index a4959b99..78bc0980 100644 --- 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 @@ -41,14 +41,31 @@ "ietf-ip:ipv4": { "infix-dhcp-client:dhcp": { "option": [ - {"id": "netmask"}, - {"id": "broadcast"}, - {"id": "router"}, - {"id": "domain"}, - {"id": "hostname"}, - {"id": "dns-server"}, - {"id": "ntp-server"}, - {"id": "vendor-class", "value": "Raspberry Pi 4 Model B"} + { + "id": "netmask" + }, + { + "id": "broadcast" + }, + { + "id": "router" + }, + { + "id": "domain" + }, + { + "id": "hostname" + }, + { + "id": "dns-server" + }, + { + "id": "ntp-server" + }, + { + "id": "vendor-class", + "value": "Raspberry Pi 4 Model B" + } ] } } @@ -126,7 +143,11 @@ "name": "default-ssh", "ssh": { "tcp-server-parameters": { - "local-address": "::" + "local-bind": [ + { + "local-address": "::" + } + ] }, "ssh-server-parameters": { "server-identity": { @@ -172,7 +193,7 @@ "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo=" }, "infix-meta:meta": { - "version": "1.6" + "version": "1.7" }, "infix-services:mdns": { "enabled": true