summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-02-18 11:25:05 +0000
committerErmal <eri@pfsense.org>2014-02-18 11:25:35 +0000
commit8c1470775944fe3041ede87e811ed8fa3a2608fa (patch)
treee89a367d6c96853140e54c52134d114a4e0b1eef
parent8f821cbcd9406a00546b7d0ffc04bfe1428cb7bc (diff)
downloadpfsense-8c1470775944fe3041ede87e811ed8fa3a2608fa.zip
pfsense-8c1470775944fe3041ede87e811ed8fa3a2608fa.tar.gz
Do not do any operations on system libraries. Nowdays pbis are used and those do not break things by definition
-rw-r--r--etc/inc/pkg-utils.inc27
1 files changed, 2 insertions, 25 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 1e5160a..ad53f4a 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -359,19 +359,6 @@ function uninstall_package($pkg_name) {
global $config, $static_output;
global $builder_package_install;
- // 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);
- mwexec("/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`", true);
- mwexec("/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`", true);
- $static_output .= "\n";
- }
- }
-
$id = get_pkg_id($pkg_name);
if ($id >= 0) {
stop_service(get_pkg_internal_name($config['installedpackages']['package'][$id]));
@@ -397,18 +384,8 @@ function uninstall_package($pkg_name) {
}
delete_package_xml($pkg_name);
- // Restore libraries that we backed up if not
- // running from the builder code.
- if(!$builder_package_install) {
- $static_output .= "Cleaning up... ";
- update_output_window($static_output);
- mwexec("/usr/bin/tar xzPfk /tmp/pkg_libs.tgz -C /", true);
- mwexec("/usr/bin/tar xzPfk /tmp/pkg_bins.tgz -C /", true);
- @unlink("/tmp/pkg_libs.tgz");
- @unlink("/tmp/pkg_bins.tgz");
- $static_output .= gettext("done.") . "\n";
- update_output_window($static_output);
- }
+ $static_output .= gettext("done.") . "\n";
+ update_output_window($static_output);
}
function force_remove_package($pkg_name) {
OpenPOWER on IntegriCloud