From 65f30611e3273570ac531e75a03c8cb35eebd55e Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Sat, 27 Dec 2008 03:33:12 +0000
Subject: TFTP adjust restore on install

---
 packages/tftp/tftp.inc | 13 ++-----------
 packages/tftp/tftp.xml |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'packages')

diff --git a/packages/tftp/tftp.inc b/packages/tftp/tftp.inc
index 26ec2be3..531c3f29 100644
--- a/packages/tftp/tftp.inc
+++ b/packages/tftp/tftp.inc
@@ -114,15 +114,8 @@ function php_install_command()
 	   exec("mkdir /usr/local/www/tftp");
 	}
 
-	//extract a specific directory to /tftpboot
-	    if (file_exists('/tmp/'.$filename)) {
-	    	//echo "The file $filename exists";
-	        system('cd /; tar xvpfz /tmp/tftp.bak.tgz');
-	        unset($filename);
-	    }	
-	
-	//rename PHP files from .tmp to .php
 	
+	//rename PHP files from .tmp to .php	
 	exec("cp /tmp/tftp_files.tmp /usr/local/www/tftp/tftp_files.php");
 	unlink_if_exists("/tmp/tftp_files.tmp");
     		
@@ -145,9 +138,7 @@ function php_install_command()
 	    	   
 	    //extract a specific directory to /usr/local/freeswitch
 	    if (file_exists('/tmp/'.$filename)) {
-	    	//echo "The file $filename exists";
-	        system('cd /tftpboot; tar xvpfz /tmp/'.$filename.' tftpboot/');
-			
+	        system('cd /; tar xvpfz /tmp/tftp.bak.tgz');			
 			unset($filename);
 	    }
   	
diff --git a/packages/tftp/tftp.xml b/packages/tftp/tftp.xml
index 7983817d..d80d7b75 100644
--- a/packages/tftp/tftp.xml
+++ b/packages/tftp/tftp.xml
@@ -41,7 +41,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>tftp Settings</name>
-	<version>0.8.1</version>
+	<version>0.8.2</version>
 	<title>TFTP: Settings</title>
 	<include_file>/usr/local/pkg/tftp.inc</include_file>
 	<menu>
-- 
cgit v1.2.3