From 4c4da7dfed9cf415580c580126e921757dbb330b Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 4 Nov 2019 08:29:45 +0100 Subject: [PATCH] openvpn: move to shared device plugin spot We already create interfaces on demand in interface_configure() so it's ok to create remaining interfaces where IPsec and VXLAN is done as well. --- src/etc/inc/interfaces.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index eca191b51..ab6df27cb 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -883,9 +883,6 @@ function interfaces_configure($verbose = false) interfaces_lagg_configure($verbose); interfaces_vlan_configure($verbose); - /* XXX temporary plugin spot */ - plugins_configure('openvpn_prepare', $verbose); - /* * Queues are set up to order interfaces according to their * dependencies / requirements of devices or other interfaces. @@ -959,8 +956,9 @@ function interfaces_configure($verbose = false) } } - /* XXX temporary plugin spot */ + /* XXX temporary plugin spot for device creation, see plugins_devices() */ plugins_configure('ipsec_prepare', $verbose); + plugins_configure('openvpn_prepare', $verbose); plugins_configure('vxlan_prepare', $verbose); interfaces_group_setup();