Commit 1716ed5b authored by Franco Fichtner's avatar Franco Fichtner

rc: slightly restructure bootup and put lo0 creation back

(cherry picked from commit b3c76778)
parent 47b2fa13
...@@ -73,7 +73,7 @@ system_devd_configure(true); ...@@ -73,7 +73,7 @@ system_devd_configure(true);
system_login_configure(true); system_login_configure(true);
/* /*
* Determine if we need to throw a interface exception * Determine if we need to throw an interface exception
* and ask the user to reassign interfaces. This will * and ask the user to reassign interfaces. This will
* avoid a reboot and thats a good thing. * avoid a reboot and thats a good thing.
*/ */
...@@ -82,6 +82,9 @@ if (is_interface_mismatch()) { ...@@ -82,6 +82,9 @@ if (is_interface_mismatch()) {
while (!set_networking_interfaces_ports(true)); while (!set_networking_interfaces_ports(true));
} }
/* loopback device is required early for syslog */
interfaces_loopback_configure(true);
system_kernel_configure(true); system_kernel_configure(true);
system_sysctl_configure(true); system_sysctl_configure(true);
system_timezone_configure(true); system_timezone_configure(true);
...@@ -115,6 +118,10 @@ mwexec("/usr/local/etc/rc.dyndns.update"); /* XXX convert to plugin */ ...@@ -115,6 +118,10 @@ mwexec("/usr/local/etc/rc.dyndns.update"); /* XXX convert to plugin */
prefer_ipv4_or_ipv6(); prefer_ipv4_or_ipv6();
filter_configure_sync(true); filter_configure_sync(true);
/* generate configuration data for all installed templates */
configd_run('template reload *');
/* start all registered bootup plugins */
plugins_configure('bootup', true); plugins_configure('bootup', true);
/* start IPsec tunnels */ /* start IPsec tunnels */
...@@ -135,9 +142,6 @@ if ($ipsec_dynamic_hosts) { ...@@ -135,9 +142,6 @@ if ($ipsec_dynamic_hosts) {
ipsec_configure(true); ipsec_configure(true);
} }
// generate configuration data for all installed templates
configd_run('template reload *');
if (is_install_media()) { if (is_install_media()) {
/* /*
* Installer mode requires setting up an extra user and * Installer mode requires setting up an extra user and
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment