From 8cfbc3c2181dd1b7e4a42bfc64e99ecbe7648141 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 17 Dec 2016 16:49:28 +0100 Subject: [PATCH] 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. --- src/etc/inc/interfaces.inc | 5 ----- src/etc/rc.bootup | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 57dc39fd1..6ab9dbbfb 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -127,11 +127,6 @@ function interfaces_loopback_configure($verbose = false) 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_flags('lo0', 'up'); diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index ed0d1d8f1..bae78583e 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -2,6 +2,7 @@ Copyright (C) 2004-2009 Scott Ullrich . Copyright (C) 2003-2004 Manuel Kasper . Copyright (C) 2009 Erik Kristensen @@ -64,9 +65,6 @@ echo "done.\n"; */ system_console_mute(); -system_devd_configure(true); -system_login_configure(true); - /* loopback device is required early for syslog and the installer */ interfaces_loopback_configure(true); @@ -95,6 +93,9 @@ global $config; $config = parse_config(true); convert_config(); +system_devd_configure(true); +system_login_configure(true); + /* * Determine if we need to throw a interface exception * and ask the user to reassign interfaces. This will