diff options
| author | Mark Crane <mcrane@pfsense.org> | 2008-12-27 03:33:12 +0000 |
|---|---|---|
| committer | Mark Crane <mcrane@pfsense.org> | 2008-12-27 03:33:12 +0000 |
| commit | 65f30611e3273570ac531e75a03c8cb35eebd55e (patch) | |
| tree | 53c75eb984e758fbffe654cb6b9468f0aaadbdbb | |
| parent | ec60b9654d8ff1c67129a1fa3cf0d4fbb1bfc239 (diff) | |
| download | pfsense-packages-65f30611e3273570ac531e75a03c8cb35eebd55e.tar.gz pfsense-packages-65f30611e3273570ac531e75a03c8cb35eebd55e.tar.bz2 pfsense-packages-65f30611e3273570ac531e75a03c8cb35eebd55e.zip | |
TFTP adjust restore on install
| -rw-r--r-- | packages/tftp/tftp.inc | 13 | ||||
| -rw-r--r-- | packages/tftp/tftp.xml | 2 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
3 files changed, 4 insertions, 13 deletions
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> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 7f824edb..4d42c884 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -80,7 +80,7 @@ <pkginfolink></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>0.8.1</version> + <version>0.8.2</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |