lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc: more loader.conf changes

Browse Source
This commit is contained in:
Franco Fichtner 2016-09-22 19:18:25 +02:00
parent 52c78955b8
commit 29dcbf58f6
6 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
+POST_INSTALL
View File

@ -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

8
+PRE_DEINSTALL
View File

@ -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

7
src/etc/inc/system.inc
View File

@ -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

1
src/etc/rc.configure_firmware
View File

@ -32,3 +32,4 @@ require_once 'util.inc';
require_once 'system.inc';
system_firmware_configure();
system_console_configure();

5
src/etc/rc.loader.d/00-banner Normal file
View File

@ -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. #
##############################################################

2
src/etc/rc.restart_webgui
View File

@ -12,8 +12,6 @@ if (count($argv) > 1 && is_numeric($argv[1])) {
sleep($argv[1]);
}
system_firmware_configure();
echo 'Restarting webConfigurator...';
system_webgui_configure();