From bcca590fa473a21c25f30d86952a81a384098f23 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 6 Jul 2012 16:04:46 -0400
Subject: Fixup post-update processing on NanoBSD

---
 tmp/post_upgrade_command     | 6 +++++-
 tmp/post_upgrade_command.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'tmp')

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");
-- 
cgit v1.1