diff options
| author | jim-p <jimp@pfsense.org> | 2012-07-08 13:32:51 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-07-08 13:32:51 -0400 |
| commit | baef6be8cfcecb043c875c2834ffb01d42244d32 (patch) | |
| tree | fb933c8f7b3e262592fc3518ce974b2070096d51 /tmp | |
| parent | b3b81528a59c42d4124e06e50f94aac8a279b679 (diff) | |
| download | pfsense-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 'tmp')
| -rwxr-xr-x | tmp/post_upgrade_command | 3 | ||||
| -rwxr-xr-x | tmp/post_upgrade_command.php | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command index c7d6567..4050998 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 6986912..fded5dd 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"); |
