Update default interfaces to use netdev generated services

main/nnd-s6-services/APKBUILD

@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=2.47
+pkgver=2.48
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"

main/nnd-s6-services/rc/bridge.br0.eth0/up

@@ -1,8 +0,0 @@
-#!/bin/execlineb -P
-define BRINFACE br0
-define SLAVEIFACE eth0
-
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
-ip link set dev $SLAVEIFACE master $BRINFACE

main/nnd-s6-services/rc/bundle.interface.eth0/type

@@ -0,0 +1 @@
+bundle

main/nnd-s6-services/rc/interface.br0.create/down

@@ -1,7 +1,5 @@
 #!/bin/execlineb -P
 define INTERFACE br0
-
 s6-envdir -i /etc/s6/env/path
 emptyenv -p
-
 ip link del $INTERFACE

main/nnd-s6-services/rc/interface.br0.create/up

@@ -1,7 +1,5 @@
 #!/bin/execlineb -P
 define INTERFACE br0
-
 s6-envdir -i /etc/s6/env/path
 emptyenv -p
-
-ip link add name $INTERFACE type bridge
+ip link add $INTERFACE type bridge

main/nnd-s6-services/rc/interface.br0.link/down

@@ -1,7 +1,5 @@
 #!/bin/execlineb -P
 define INTERFACE br0
-
 s6-envdir -i /etc/s6/env/path
 emptyenv -p
-
 ip link set dev $INTERFACE down

main/nnd-s6-services/rc/interface.br0.link/up

@@ -1,7 +1,5 @@
 #!/bin/execlineb -P
 define INTERFACE br0
-
 s6-envdir -i /etc/s6/env/path
 emptyenv -p
-
 ip link set dev $INTERFACE up

main/nnd-s6-services/rc/interface.br0.mcast_mld_version/up

@@ -0,0 +1,7 @@
+#!/bin/execlineb -P
+define INTERFACE br0
+define PROP mcast_mld_version
+define STATE 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+ip link set $INTERFACE type bridge $PROP $STATE

main/nnd-s6-services/rc/interface.br0.mcast_querier/down

@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+define INTERFACE br0
+define PROP mcast_querier
+define STATE 0
+ip link set $INTERFACE type bridge $PROP $STATE

main/nnd-s6-services/rc/interface.br0.mcast_querier/up

@@ -0,0 +1,7 @@
+#!/bin/execlineb -P
+define INTERFACE br0
+define PROP mcast_querier
+define STATE 1
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+ip link set $INTERFACE type bridge $PROP $STATE

main/nnd-s6-services/rc/interface.br0.mcast_router/down

@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+define INTERFACE br0
+define PROP mcast_router
+define STATE 0
+ip link set $INTERFACE type bridge $PROP $STATE

main/nnd-s6-services/rc/interface.br0.mcast_router/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/interface.br0.mcast_router/up

@@ -0,0 +1,7 @@
+#!/bin/execlineb -P
+define INTERFACE br0
+define PROP mcast_router
+define STATE 1
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+ip link set $INTERFACE type bridge $PROP $STATE

main/nnd-s6-services/rc/interface.br0.mcast_snooping/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/interface.br0.mcast_snooping/up

@@ -0,0 +1,7 @@
+#!/bin/execlineb -P
+define INTERFACE br0
+define PROP mcast_snooping
+define STATE 0
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+ip link set $INTERFACE type bridge $PROP $STATE

main/nnd-s6-services/rc/interface.br0.slave.eth0/down

@@ -1,7 +1,5 @@
 #!/bin/execlineb -P
-define SLAVEIFACE eth0
-
+define SLAVEIF eth0
 s6-envdir -i /etc/s6/env/path
 emptyenv -p
-
-ip link set dev $SLAVEIFACE nomaster
+ip link set dev $SLAVEIF nomaster

main/nnd-s6-services/rc/interface.br0.slave.eth0/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/interface.br0.slave.eth0/up

@@ -0,0 +1,6 @@
+#!/bin/execlineb -P
+define MASTERIF br0
+define SLAVEIF eth0
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+ip link set dev $SLAVEIF master $MASTERIF

main/nnd-s6-services/rc/interface.br0.stp_state/down

@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+define INTERFACE br0
+define PROP stp_state
+define STATE 0
+ip link set $INTERFACE type bridge $PROP $STATE

main/nnd-s6-services/rc/interface.br0.stp_state/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/interface.br0.stp_state/up

@@ -0,0 +1,7 @@
+#!/bin/execlineb -P
+define INTERFACE br0
+define PROP stp_state
+define STATE 1
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+ip link set $INTERFACE type bridge $PROP $STATE

main/nnd-s6-services/rc/interface.eth0.create/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/interface.eth0.create/up

@@ -1,7 +1,5 @@
 #!/bin/execlineb -P
 define INTERFACE eth0
-
 s6-envdir -i /etc/s6/env/path
 emptyenv -p
-
-bcnm-waitif -u 1 $INTERFACE
+bcnm-waitif 1 $INTERFACE

main/nnd-s6-services/rc/interface.eth0.link/down

@@ -1,7 +1,5 @@
 #!/bin/execlineb -P
 define INTERFACE eth0
-
 s6-envdir -i /etc/s6/env/path
 emptyenv -p
-
 ip link set dev $INTERFACE down

main/nnd-s6-services/rc/interface.eth0.link/up

@@ -1,7 +1,5 @@
 #!/bin/execlineb -P
 define INTERFACE eth0
-
 s6-envdir -i /etc/s6/env/path
 emptyenv -p
-
 ip link set dev $INTERFACE up