diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-06-28 16:55:51 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-06-28 16:55:51 -0300 |
| commit | 4842755397c92f1c16b50b16e01b28768f8b43c1 (patch) | |
| tree | 97f0dbf4361974041eccfd6bbf50d5c44836942d /etc/inc/pkg-utils.inc | |
| parent | f0b17f3f7226f819c94dfab4c9abc0f3e4962152 (diff) | |
| parent | 84924e76c44950387e387af7927f63d5822dfda4 (diff) | |
| download | pfsense-4842755397c92f1c16b50b16e01b28768f8b43c1.zip pfsense-4842755397c92f1c16b50b16e01b28768f8b43c1.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Diffstat (limited to 'etc/inc/pkg-utils.inc')
| -rw-r--r-- | etc/inc/pkg-utils.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index b735375..2f47f3c 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -316,11 +316,13 @@ function uninstall_package($pkg_name) { // Back up /usr/local/lib libraries first if // not running from the builder code. + // also take into account rrd binaries if(!$builder_package_install) { if(!file_exists("/tmp/pkg_libs.tgz")) { $static_output .= "Backing up libraries... "; update_output_window($static_output); exec("/usr/bin/tar czPf /tmp/pkg_libs.tgz `/bin/cat /etc/pfSense_md5.txt | /usr/bin/grep 'local/lib' | /usr/bin/awk '{ print $2 }' | /usr/bin/cut -d'(' -f2 | /usr/bin/cut -d')' -f1`"); + exec("/usr/bin/tar czPf /tmp/pkg_bins.tgz `/bin/cat /etc/pfSense_md5.txt | /usr/bin/grep 'rrd' | /usr/bin/awk '{ print $2 }' | /usr/bin/cut -d'(' -f2 | /usr/bin/cut -d')' -f1`"); $static_output .= "\n"; } } @@ -345,7 +347,9 @@ function uninstall_package($pkg_name) { $static_output .= "Cleaning up... "; update_output_window($static_output); exec("/usr/bin/tar xzPfU /tmp/pkg_libs.tgz -C /"); - @unlink("/tmp/pkg_libs.tgz"); + exec("/usr/bin/tar xzPfU /tmp/pkg_bins.tgz -C /"); + @unlink("/tmp/pkg_libs.tgz"); + @unlink("/tmp/pkg_bins.tgz"); } } @@ -491,7 +495,7 @@ function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url = update_output_window($static_output); } } - $static_output .= " (extracting)"; + $static_output .= " (extracting)\n"; update_output_window($static_output); $slaveout = ""; exec("/usr/bin/tar --fast-read -O -f {$fetchto} -x +CONTENTS 2>&1", $slaveout); |
