diff options
author | mcrane <mctch@yahoo.com> | 2009-08-25 15:52:05 -0600 |
---|---|---|
committer | mcrane <mctch@yahoo.com> | 2009-08-25 15:53:23 -0600 |
commit | f4da69b1577aab50790745a7b82fa373c6fcaeed (patch) | |
tree | 0fbb290b1942c4716059e0e75cb013257e59c64b /config/tftp/tftp.inc | |
parent | c3592111b51ff3ff2a7167aca714af36b1d50fab (diff) | |
download | pfsense-packages-f4da69b1577aab50790745a7b82fa373c6fcaeed.tar.gz pfsense-packages-f4da69b1577aab50790745a7b82fa373c6fcaeed.tar.bz2 pfsense-packages-f4da69b1577aab50790745a7b82fa373c6fcaeed.zip |
TFTP package fix uninstall error. And fix installation on pfsense 2.0.
Diffstat (limited to 'config/tftp/tftp.inc')
-rw-r--r-- | config/tftp/tftp.inc | 8 |
1 files changed, 7 insertions, 1 deletions
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"); |