diff options
author | jim-p <jimp@pfsense.org> | 2012-07-06 16:04:46 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2012-07-06 16:04:46 -0400 |
commit | bcca590fa473a21c25f30d86952a81a384098f23 (patch) | |
tree | 002bd00f076d0885830a26bf48bbf3d0b0d67834 | |
parent | f60156f68f615dc137391f3a909a0ee7a0c3c003 (diff) | |
download | pfsense-bcca590fa473a21c25f30d86952a81a384098f23.zip pfsense-bcca590fa473a21c25f30d86952a81a384098f23.tar.gz |
Fixup post-update processing on NanoBSD
-rwxr-xr-x | tmp/post_upgrade_command | 6 | ||||
-rwxr-xr-x | tmp/post_upgrade_command.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command index e6c09a8..c7d6567 100755 --- a/tmp/post_upgrade_command +++ b/tmp/post_upgrade_command @@ -72,7 +72,11 @@ 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 -/tmp/post_upgrade_command.php $1 +if [ -x /tmp/$1/tmp/post_upgrade_command.php ]; then + /tmp/$1/tmp/post_upgrade_command.php $1 >> /conf/upgrade_log.txt 2>&1 +elif [ -f /tmp/post_upgrade_command.php ]; then + /tmp/post_upgrade_command.php $1 +fi # Remove any previous MD5 sum files rm -f /root/*.md5 diff --git a/tmp/post_upgrade_command.php b/tmp/post_upgrade_command.php index 00172b2..6986912 100755 --- a/tmp/post_upgrade_command.php +++ b/tmp/post_upgrade_command.php @@ -20,7 +20,7 @@ $newslicedir = ""; if ($ARGV[1] != "") - $newslicedir = '/tmp' . $ARGV[1]; + $newslicedir = '/tmp/' . $ARGV[1]; setup_serial_port("upgrade", $newslicedir); $files_to_process = file("/etc/pfSense.obsoletedfiles"); |