From 5f319ade89f413b3181efab6b7932108e6635ec7 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 26 Feb 2017 16:59:19 +0100
Subject: [PATCH] installer: kill the early installer, it needs a qualified tty
 hint

---
 src/etc/rc.bootup    | 26 +-------------------------
 src/etc/rc.installer |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index ce524989f..6340febcd 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -65,30 +65,6 @@ echo "done.\n";
  */
 system_console_mute();
 
-/* loopback device is required early for syslog and the installer */
-interfaces_loopback_configure(true);
-
-$setup_installer = is_install_media();
-if ($setup_installer) {
-    echo 'Press any key to start the early installer:  ';
-
-    $key = timeout();
-    if ($key != "\n") {
-        echo "\n";
-    }
-
-    if (isset($key)) {
-        passthru('/usr/local/etc/rc.installer');
-        if (file_exists('/tmp/install_complete')) {
-            passthru('/usr/local/etc/rc.reboot');
-            exit;
-        }
-    }
-
-    /* config may have changed via installer import */
-    OPNsense\Core\Config::getInstance()->forceReload();
-}
-
 global $config;
 $config = parse_config(true);
 convert_config();
@@ -162,7 +138,7 @@ if ($ipsec_dynamic_hosts) {
 // generate configuration data for all installed templates
 configd_run('template reload *');
 
-if ($setup_installer) {
+if (is_install_media()) {
     /*
      * Installer mode requires setting up an extra user and
      * we will protect it with root's password.  We can only
diff --git a/src/etc/rc.installer b/src/etc/rc.installer
index 446b971e9..cd228098d 100755
--- a/src/etc/rc.installer
+++ b/src/etc/rc.installer
@@ -78,4 +78,4 @@ for n in 5 4 3 2 1; do
 done
 echo
 
-reboot
+/usr/local/etc/rc.reboot