diff options
| -rw-r--r-- | config/freeswitch_dev/v_config.inc | 4 | ||||
| -rw-r--r-- | config/freeswitch_dev/v_status.tmp | 2 | ||||
| -rw-r--r-- | config/tftp/tftp.inc | 8 | ||||
| -rw-r--r-- | config/tftp/tftp.xml | 2 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 2 |
5 files changed, 12 insertions, 6 deletions
diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc index a3573ba9..3b3e093c 100644 --- a/config/freeswitch_dev/v_config.inc +++ b/config/freeswitch_dev/v_config.inc @@ -3907,8 +3907,8 @@ function v_install_phase_1() write_rcfile(array( "file" => $v_name.".sh", - "start" => $v_dir."/bin/./freeswitch -nc", - "stop" => $v_dir."/bin/./freeswitch -stop" + "start" => $v_dir."/bin/./".$v_name." -nc", + "stop" => $v_dir."/bin/./".$v_name." -stop" ) ); diff --git a/config/freeswitch_dev/v_status.tmp b/config/freeswitch_dev/v_status.tmp index 70cef363..3a3d6097 100644 --- a/config/freeswitch_dev/v_status.tmp +++ b/config/freeswitch_dev/v_status.tmp @@ -351,7 +351,7 @@ echo "<br /><br />\n\n"; echo "<b>tail -n 500 ".$v_log_dir."/".$v_name.".log</b><br />\n"; -echo "<textarea id='log' name='log' cols='93' rows='30' wrap='off'>\n"; +echo "<textarea id='log' name='log' style='width:99%'; rows='30' wrap='off'>\n"; echo system("tail -n 500 ".$v_log_dir."/".$v_name.".log"); echo "</textarea>\n"; echo "<br /><br />\n\n"; 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"); diff --git a/config/tftp/tftp.xml b/config/tftp/tftp.xml index 9496363e..5a2cefa5 100644 --- a/config/tftp/tftp.xml +++ b/config/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>1.0.6</version> + <version>1.0.7</version> <title>TFTP: Settings</title> <include_file>/usr/local/pkg/tftp.inc</include_file> <menu> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index b0c5da8c..f436109a 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -154,7 +154,7 @@ <pkginfolink/> <config_file>http://www.pfsense.com/packages/config/tftp/tftp.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>1.0.6</version> + <version>1.0.7</version> <status>Stable</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |