Skip to content

Commit 10374a3

Browse files
mattiaswalmattiaswal
committed
Upgrade FRR to 10.5.1
This includes adding a netd-daemon since FRR has gone towards all daemons should be configured from mgmtd using YANG, netd uses gRPC to reconfigure in mgmtd
1 parent 80ab53e commit 10374a3

46 files changed

Lines changed: 3238 additions & 404 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎board/common/rootfs/etc/default/mgmtd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MGMTD_ARGS="-A 127.0.0.1 -u frr -g frr --log syslog --log-level err -M grpc"

‎board/common/rootfs/etc/finit.d/available/netd.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#set DEBUG=1
2+
3+
service <!pid/mgmtd> name:netd log [S12345] netd -p /run/netd.pid -- Network route daemon

‎board/common/rootfs/etc/finit.d/enabled/netd.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../available/netd.conf

‎board/common/rootfs/etc/netd/conf.d/.empty‎

Whitespace-only changes.

‎board/common/rootfs/usr/share/udhcpc/default.script‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ACTION="$1"
77
IP_CACHE="/var/lib/misc/${interface}.cache"
88
RESOLV_CONF="/run/resolvconf/interfaces/${interface}.conf"
99
NTPFILE="/run/chrony/dhcp-sources.d/${interface}.sources"
10-
NAME="/etc/frr/static.d/${interface}-dhcp.conf"
10+
NAME="/etc/netd/conf.d/${interface}-dhcp.conf"
1111
NEXT="${NAME}+"
1212

1313
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
@@ -102,7 +102,8 @@ set_dhcp_routes()
102102
cmp -s "$NAME" "$NEXT" && return
103103
mv "$NEXT" "$NAME"
104104

105-
initctl -nbq restart staticd
105+
killall -SIGHUP netd
106+
killall staticd
106107
}
107108

108109
clr_dhcp_routes()
@@ -111,7 +112,8 @@ clr_dhcp_routes()
111112
[ -f "$NAME" ] || return
112113
rm "$NAME"
113114

114-
initctl -nbq restart staticd
115+
killall -SIGHUP netd
116+
killall staticd
115117
}
116118

117119
clr_dhcp_addresses()

‎buildroot‎

‎configs/aarch64_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
149149
BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y
150150
BR2_PACKAGE_FEATURE_WIFI_REALTEK=y
151151
BR2_PACKAGE_CONFD=y
152+
BR2_PACKAGE_NETD=y
152153
BR2_PACKAGE_CONFD_TEST_MODE=y
153154
BR2_PACKAGE_CURIOS_HTTPD=y
154155
BR2_PACKAGE_CURIOS_NFTABLES=y

‎configs/aarch64_minimal_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ INFIX_HOME="https://github.com/kernelkit/infix/"
125125
INFIX_DOC="https://kernelkit.org/infix/"
126126
INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
127127
BR2_PACKAGE_CONFD=y
128+
BR2_PACKAGE_NETD=y
128129
BR2_PACKAGE_CONFD_TEST_MODE=y
129130
BR2_PACKAGE_GENCERT=y
130131
BR2_PACKAGE_STATD=y

‎configs/arm_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
144144
BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y
145145
BR2_PACKAGE_FEATURE_WIFI_REALTEK=y
146146
BR2_PACKAGE_CONFD=y
147+
BR2_PACKAGE_NETD=y
147148
BR2_PACKAGE_CONFD_TEST_MODE=y
148149
BR2_PACKAGE_GENCERT=y
149150
BR2_PACKAGE_STATD=y

‎configs/arm_minimal_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ INFIX_HOME="https://github.com/kernelkit/infix/"
124124
INFIX_DOC="https://kernelkit.org/infix/"
125125
INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
126126
BR2_PACKAGE_CONFD=y
127+
BR2_PACKAGE_NETD=y
127128
BR2_PACKAGE_CONFD_TEST_MODE=y
128129
BR2_PACKAGE_GENCERT=y
129130
BR2_PACKAGE_STATD=y

0 commit comments

Comments
 (0)