Commit 8cfbc3c2 authored by Franco Fichtner's avatar Franco Fichtner

rc: wrap this around for consistency

Early installer is really about an untained system, so
we defer *all* system setup and only keep the loopback
configuration above it.  This way, after config import
from the installer system_login_configure() is up-to-date.
parent 4ad78901
...@@ -127,11 +127,6 @@ function interfaces_loopback_configure($verbose = false) ...@@ -127,11 +127,6 @@ function interfaces_loopback_configure($verbose = false)
flush(); flush();
} }
/*
* This function is called very early, we must
* make sure the config is not required.
*/
legacy_interface_setaddress('lo0', '127.0.0.1'); legacy_interface_setaddress('lo0', '127.0.0.1');
legacy_interface_flags('lo0', 'up'); legacy_interface_flags('lo0', 'up');
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<?php <?php
/* /*
Copyright (C) 2014-2016 Franco Fichtner <franco@opnsense.org>
Copyright (C) 2004-2009 Scott Ullrich <sullrich@pfsense.org>. Copyright (C) 2004-2009 Scott Ullrich <sullrich@pfsense.org>.
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
Copyright (C) 2009 Erik Kristensen Copyright (C) 2009 Erik Kristensen
...@@ -64,9 +65,6 @@ echo "done.\n"; ...@@ -64,9 +65,6 @@ echo "done.\n";
*/ */
system_console_mute(); system_console_mute();
system_devd_configure(true);
system_login_configure(true);
/* loopback device is required early for syslog and the installer */ /* loopback device is required early for syslog and the installer */
interfaces_loopback_configure(true); interfaces_loopback_configure(true);
...@@ -95,6 +93,9 @@ global $config; ...@@ -95,6 +93,9 @@ global $config;
$config = parse_config(true); $config = parse_config(true);
convert_config(); convert_config();
system_devd_configure(true);
system_login_configure(true);
/* /*
* Determine if we need to throw a interface exception * Determine if we need to throw a interface exception
* and ask the user to reassign interfaces. This will * and ask the user to reassign interfaces. This will
......
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