diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-23 16:12:05 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-23 16:12:05 -0400 |
| commit | 034e4e83d787863991c230d549d63e60242c6d90 (patch) | |
| tree | b9ba8f2b8281d99de9c22f97d616c0fc1a69d669 /etc/inc | |
| parent | 0e61e3e47e7a96100225780f0c2abea8d7385c21 (diff) | |
| parent | ca4acbcdd84195c9917363fceabcd4b5294bf1d0 (diff) | |
| download | pfsense-034e4e83d787863991c230d549d63e60242c6d90.zip pfsense-034e4e83d787863991c230d549d63e60242c6d90.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/filter.inc | 3 | ||||
| -rw-r--r-- | etc/inc/pkg-utils.inc | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 6776c3a..7d39662 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -558,7 +558,8 @@ function filter_generate_aliases() { $tableaddrs = "{$addrlist}{$extralias}"; if(empty($tableaddrs)) { $aliases .= "table <{$aliased['name']}> persist\n"; - $after_filter_configure_run[] = "/sbin/pfctl -T flush -t " . escapeshellarg($aliased['name']); + if (empty($aliased['address'])) + $after_filter_configure_run[] = "/sbin/pfctl -T flush -t " . escapeshellarg($aliased['name']); } else $aliases .= "table <{$aliased['name']}> { {$addrlist}{$extralias} } \n"; diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 660d442..8bf9515 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"); } } @@ -1190,4 +1194,4 @@ function pkg_reinstall_all() { } } -?> +?>
\ No newline at end of file |
