diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 778250e3ce..745ef8e2a5 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 483b0b4024..54a115c493 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 diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command index c7d6567f08..4050998273 100755 --- a/tmp/post_upgrade_command +++ b/tmp/post_upgrade_command @@ -72,9 +72,12 @@ echo "$detect_command" > $CVS_CO_DIR/root/.shrc echo "$detect_command" >> $CVS_CO_DIR/root/.profile # Now turn on or off serial console as needed +echo "Checking for /tmp/$1/tmp/post_upgrade_command.php... " >> /conf/upgrade_log.txt if [ -x /tmp/$1/tmp/post_upgrade_command.php ]; then + echo "Running /tmp/$1/tmp/post_upgrade_command.php $1" >> /conf/upgrade_log.txt /tmp/$1/tmp/post_upgrade_command.php $1 >> /conf/upgrade_log.txt 2>&1 elif [ -f /tmp/post_upgrade_command.php ]; then + echo "Running /tmp/post_upgrade_command.php $1" >> /conf/upgrade_log.txt /tmp/post_upgrade_command.php $1 fi diff --git a/tmp/post_upgrade_command.php b/tmp/post_upgrade_command.php index 6986912b4b..fded5ddb4b 100755 --- a/tmp/post_upgrade_command.php +++ b/tmp/post_upgrade_command.php @@ -21,6 +21,7 @@ $newslicedir = ""; if ($ARGV[1] != "") $newslicedir = '/tmp/' . $ARGV[1]; + system("echo \"Adding serial port settings ({$newslicedir})...\" >> /conf/upgrade_log.txt"); setup_serial_port("upgrade", $newslicedir); $files_to_process = file("/etc/pfSense.obsoletedfiles");