summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-07-08 13:32:51 -0400
committerjim-p <jimp@pfsense.org>2012-07-08 13:32:51 -0400
commitbaef6be8cfcecb043c875c2834ffb01d42244d32 (patch)
treefb933c8f7b3e262592fc3518ce974b2070096d51 /etc
parentb3b81528a59c42d4124e06e50f94aac8a279b679 (diff)
downloadpfsense-baef6be8cfcecb043c875c2834ffb01d42244d32.zip
pfsense-baef6be8cfcecb043c875c2834ffb01d42244d32.tar.gz
Be more verbose during upgrade to see why nanobsd isn't carrying over the setting as expected.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pfsense-utils.inc2
-rwxr-xr-xetc/rc.firmware2
2 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 778250e..745ef8e 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -976,6 +976,8 @@ function setup_serial_port($when="save", $path="") {
}
if($g['platform'] != "cdrom") {
/* serial console - write out /boot/loader.conf */
+ if ($when == "upgrade")
+ system("echo \"Reading {$loader_conf_file}...\" >> /conf/upgrade_log.txt");
$boot_config = file_get_contents($loader_conf_file);
$boot_config_split = explode("\n", $boot_config);
if(count($boot_config_split) > 0) {
diff --git a/etc/rc.firmware b/etc/rc.firmware
index 483b0b4..54a115c 100755
--- a/etc/rc.firmware
+++ b/etc/rc.firmware
@@ -298,7 +298,9 @@ pfSenseNanoBSDupgrade)
# If /tmp/$GLABEL_SLICE/tmp/post_upgrade_command exists
# after update then execute the command.
+ echo "Checking for post_upgrade_command..." >> /conf/upgrade_log.txt
if [ -f /tmp/$GLABEL_SLICE/tmp/post_upgrade_command ]; then
+ echo "Found post_upgrade_command, executing ($GLABEL_SLICE)..." >> /conf/upgrade_log.txt
sh /tmp/$GLABEL_SLICE/tmp/post_upgrade_command $GLABEL_SLICE >> /conf/upgrade_log.txt 2>&1
fi
OpenPOWER on IntegriCloud