From f4da69b1577aab50790745a7b82fa373c6fcaeed Mon Sep 17 00:00:00 2001
From: mcrane <mctch@yahoo.com>
Date: Tue, 25 Aug 2009 15:52:05 -0600
Subject: TFTP package fix uninstall error. And fix installation on pfsense
 2.0.

---
 config/tftp/tftp.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'config/tftp/tftp.inc')

diff --git a/config/tftp/tftp.inc b/config/tftp/tftp.inc
index a6d91af9..ba77818a 100644
--- a/config/tftp/tftp.inc
+++ b/config/tftp/tftp.inc
@@ -262,6 +262,11 @@ function php_deinstall_command()
 {
 
 	//prepare inetd.conf for tftp
+		//tftp	dgram	udp	wait	root	/usr/libexec/tftpd	tftpd -l -s /tftpboot
+		
+		//pfsense 2.0 conflicting entry
+		//tftp	dgram	udp	wait	root	/usr/local/sbin/tftp-proxy -v
+		
 		$filename = "/etc/inetd.conf";
 		$handle = fopen($filename,"rb");
 		$contents = fread($handle, filesize($filename));	
@@ -269,9 +274,10 @@ function php_deinstall_command()
 		
 		$handle = fopen($filename,"w");
 		$contents = str_replace("tftp	dgram", "#tftp	dgram", $contents);
+		$contents = str_replace("tftpd -l -s /tftpboot", "/usr/local/sbin/tftp-proxy -v", $contents);
 		fwrite($handle, $contents);		
 		unset($contents); 	
-		fclose($fout);
+		fclose($handle);
 		unset($filename);
 		
 	exec("killall -9 inetd");
-- 
cgit v1.2.3