From 29dcbf58f6a3529e73b54d546608ba660a75eead Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 22 Sep 2016 19:18:25 +0200
Subject: [PATCH] rc: more loader.conf changes

---
 +POST_INSTALL                 | 16 +++-------------
 +PRE_DEINSTALL                |  8 --------
 src/etc/inc/system.inc        |  7 +++++--
 src/etc/rc.configure_firmware |  1 +
 src/etc/rc.loader.d/00-banner |  5 +++++
 src/etc/rc.restart_webgui     |  2 --
 6 files changed, 14 insertions(+), 25 deletions(-)
 create mode 100644 src/etc/rc.loader.d/00-banner

diff --git a/+POST_INSTALL b/+POST_INSTALL
index e06c2ec32..c92f7967a 100644
--- a/+POST_INSTALL
+++ b/+POST_INSTALL
@@ -21,19 +21,6 @@ EOF
 cat /etc/rc.bak >> /etc/rc
 rm -f /etc/rc.bak
 
-echo "Updating /boot/loader.conf"
-touch /boot/loader.conf
-cp /boot/loader.conf /boot/loader.conf.bak
-(grep -v loader_brand /boot/loader.conf.bak; \
-    echo 'loader_brand="opnsense"') > /boot/loader.conf
-cp /boot/loader.conf /boot/loader.conf.bak
-(grep -v loader_logo /boot/loader.conf.bak; \
-    echo 'loader_logo="hourglass"') > /boot/loader.conf
-cp /boot/loader.conf /boot/loader.conf.bak
-(grep -v loader_menu_title /boot/loader.conf.bak; \
-    echo 'loader_menu_title=""') > /boot/loader.conf
-rm -f /boot/loader.conf.bak
-
 echo "Writing package version"
 mkdir -p /usr/local/opnsense/version
 if [ -f /usr/local/opnsense/version/opnsense ]; then
@@ -54,6 +41,9 @@ rm -f /usr/local/opnsense/mvc/app/cache/*.php
 echo "Execute model migrations"
 /usr/local/opnsense/mvc/script/run_migrations.php
 
+echo "Reloading firmware configuration"
+/usr/local/etc/rc.configure_firmware
+
 echo "Reloading GUI configuration"
 /usr/local/etc/rc.php_ini_setup
 if pgrep -q php-cgi; then
diff --git a/+PRE_DEINSTALL b/+PRE_DEINSTALL
index 15cc55274..43e013faf 100644
--- a/+PRE_DEINSTALL
+++ b/+PRE_DEINSTALL
@@ -9,14 +9,6 @@ cp /etc/shells /etc/shells.bak
 (grep -v /usr/local/etc/rc.installer /etc/shells.bak) > /etc/shells
 rm -f /etc/shells.bak
 
-echo "Updating /boot/loader.conf"
-touch /boot/loader.conf
-cp /boot/loader.conf /boot/loader.conf.bak
-(grep -v loader_brand /boot/loader.conf.bak) > /boot/loader.conf
-cp /boot/loader.conf /boot/loader.conf.bak
-(grep -v loader_logo /boot/loader.conf.bak) > /boot/loader.conf
-rm -f /boot/loader.conf.bak
-
 echo "Unhooking from /etc/rc"
 cp /etc/rc /etc/rc.bak
 tail -n +4 /etc/rc.bak > /etc/rc
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 1ace54ef8..b44a20c14 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1930,9 +1930,7 @@ function system_console_configure()
     // ** console settings in /boot/loader.conf
     $new_boot_config = array();
     $new_boot_config['comconsole_speed'] = null;
-    $new_boot_config['autoboot_delay'] = '"3"';
     $new_boot_config['boot_multicons'] = null;
-    $new_boot_config['hw.usb.no_pf'] = '"1"';
     $new_boot_config['boot_serial'] = null;
     $new_boot_config['console'] = null;
 
@@ -1969,6 +1967,11 @@ function system_console_configure()
             $new_loader_conf .= $line . "\n";
         }
     }
+
+    /* reload static values from rc.loader.d */
+    mwexecf('/usr/local/etc/rc.loader');
+
+    /* inject dynamic values directly into loader.conf */
     @file_put_contents('/boot/loader.conf', $new_loader_conf);
 
     // ** setup /etc/ttys
diff --git a/src/etc/rc.configure_firmware b/src/etc/rc.configure_firmware
index b3bae9e47..8b0fd4c4e 100755
--- a/src/etc/rc.configure_firmware
+++ b/src/etc/rc.configure_firmware
@@ -32,3 +32,4 @@ require_once 'util.inc';
 require_once 'system.inc';
 
 system_firmware_configure();
+system_console_configure();
diff --git a/src/etc/rc.loader.d/00-banner b/src/etc/rc.loader.d/00-banner
new file mode 100644
index 000000000..b39f8dd90
--- /dev/null
+++ b/src/etc/rc.loader.d/00-banner
@@ -0,0 +1,5 @@
+##############################################################
+# This file was auto-generated using the rc.loader facility. #
+# In order to deploy a custom change to this installation,   #
+# please use /boot/loader.conf.local as it is not written.   #
+##############################################################
diff --git a/src/etc/rc.restart_webgui b/src/etc/rc.restart_webgui
index 44a2f1dfa..9c33045de 100755
--- a/src/etc/rc.restart_webgui
+++ b/src/etc/rc.restart_webgui
@@ -12,8 +12,6 @@ if (count($argv) > 1 && is_numeric($argv[1])) {
     sleep($argv[1]);
 }
 
-system_firmware_configure();
-
 echo 'Restarting webConfigurator...';
 
 system_webgui_configure();