From 83670156cecaebf32526cc1c2dc563c4225df7b1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 20 Dec 2017 00:43:13 +0100
Subject: [PATCH] openvpn: start later alongside IPsec

Matches previous, no apparent reason not to do this.
---
 src/etc/inc/plugins.inc.d/ipsec.inc | 1 -
 src/etc/rc.bootup                   | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc
index 46c390fa9..adcd01237 100644
--- a/src/etc/inc/plugins.inc.d/ipsec.inc
+++ b/src/etc/inc/plugins.inc.d/ipsec.inc
@@ -114,7 +114,6 @@ $p2_pfskeygroups = array(
 function ipsec_configure()
 {
     return array(
-        'bootup' => array('ipsec_configure_do'), /* XXX until OpenVPN moves */
         'vpn' => array('ipsec_configure_do:2'),
     );
 }
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index 435b3ca74..c7cf58179 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -97,8 +97,6 @@ system_syslogd_start(true);
 
 openvpn_prepare_all(true);
 interfaces_configure(true);
-/* XXX move to plugin 'vpn' hook below */
-openvpn_configure_do(true);
 
 system_resolvconf_generate(true);
 filter_configure_sync(true);
@@ -120,7 +118,7 @@ filter_configure_sync(true);
 /* XXX components must generate their stuff on their own */
 configd_run('template reload *');
 
-/* XXX vpn call before other bootup */
+plugins_configure('vpn', true);
 plugins_configure('bootup', true);
 
 rrd_configure(true);