diff options
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 9 | ||||
| -rwxr-xr-x | src/usr/local/bin/beep.sh | 8 | ||||
| -rw-r--r-- | src/usr/local/www/diag_backup.php | 8 |
3 files changed, 19 insertions, 6 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index ebf75c8..5f8998a 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1164,7 +1164,14 @@ function setup_serial_port($when = "save", $path = "") { system("echo \"Reading {$loader_conf_file}...\" >> /conf/upgrade_log.txt"); } - $loader_conf = file_get_contents($loader_conf_file); + if (file_exists($loader_conf_file)) { + $loader_conf = file_get_contents($loader_conf_file); + } elseif (file_exists("{$path}/boot/loader.conf.local")) { + $loader_conf_file = "{$path}/boot/loader.conf.local"; + $loader_conf = file_get_contents($loader_conf_file); + } else { + $loader_conf = ""; + } $loader_conf_split = explode("\n", $loader_conf); $data = array(); diff --git a/src/usr/local/bin/beep.sh b/src/usr/local/bin/beep.sh index 0a37d2f..fba8219 100755 --- a/src/usr/local/bin/beep.sh +++ b/src/usr/local/bin/beep.sh @@ -35,11 +35,9 @@ if [ -f /var/log/dmesg.boot ]; then fi # Check for different HZ -if [ -f /boot/loader.conf ]; then - HZ=`/usr/bin/grep -c kern.hz /boot/loader.conf` - if [ "$HZ" = "1" ]; then - NOTELENGTH="10" - fi +HZ=`/sbin/sysctl -n kern.hz` +if [ "$HZ" = "1" ]; then + NOTELENGTH="10" fi if [ -c "/dev/speaker" ]; then diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index cf136fa..350cc68 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -303,6 +303,14 @@ if ($_POST) { } unset($loaderconf); } + if (file_exists("/boot/loader.conf.local")) { + $loaderconf = file_get_contents("/boot/loader.conf.local"); + if (strpos($loaderconf, "console=\"comconsole")) { + $config['system']['enableserial'] = true; + write_config(gettext("Restore serial console enabling in configuration.")); + } + unset($loaderconf); + } /* extract out rrd items, unset from $config when done */ if ($config['rrddata']) { restore_rrddata(); |
