From d09d53ac6906bdd1d94ced58872aec862e342898 Mon Sep 17 00:00:00 2001 From: Ermal Date: Fri, 20 Aug 2010 15:48:40 +0000 Subject: When booting up do not try to configure ovpn[c|s] interfaces if present also try to configure openvpn eariler just after the interfaces have been setup. --- etc/inc/interfaces.inc | 5 ++++- etc/rc.bootup | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'etc') diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index e1735b3..1c07158 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -713,7 +713,10 @@ function interfaces_configure() { $delayed_list[$if] = $ifname; else if (strstr($realif, "gif")) $delayed_list[$if] = $ifname; - else { + else if (strstr($realif, "ovpn")) { + //echo "Delaying OpenVPN interface configuration...done.\n"; + continue; + } else { if ($g['booting']) echo "Configuring {$ifname} interface..."; if($g['debug']) diff --git a/etc/rc.bootup b/etc/rc.bootup index 6141d91..f150b80 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -228,6 +228,11 @@ if(!$debugging) /* re-make hosts file after configuring interfaces */ system_hosts_generate(); +/* start OpenVPN server & clients */ +echo "Syncing OpenVPN settings..."; +openvpn_resync_all(); +echo "done.\n"; + /* generate resolv.conf */ system_resolvconf_generate(); @@ -255,11 +260,6 @@ if (empty($config['system']['webgui']['backend'])) local_sync_accounts(); echo "done.\n"; -/* start OpenVPN server & clients */ -echo "Syncing OpenVPN settings..."; -openvpn_resync_all(); -echo "done.\n"; - if($avail > 0 and $avail < 65) { echo "System has less than 65 megabytes of ram {$avail}. Delaying webConfigurator startup.\n"; /* start webConfigurator up on final pass */ -- cgit v1.1