diff options
| author | Ermal <eri@pfsense.org> | 2011-08-03 14:30:16 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-08-03 14:30:31 +0000 |
| commit | 27018d3cc4f12c995efadf5dc5ba90eb7c1aa641 (patch) | |
| tree | 954212533aec283d53acf072225730aea5e1a2eb /etc | |
| parent | dd40d6641db9b1619dcf7abafa2c47b69b456867 (diff) | |
| download | pfsense-27018d3cc4f12c995efadf5dc5ba90eb7c1aa641.zip pfsense-27018d3cc4f12c995efadf5dc5ba90eb7c1aa641.tar.gz | |
Add yet another intermediate config write during pacakge processing which breaks some installation steps.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 2 | ||||
| -rw-r--r-- | etc/inc/pkg-utils.inc | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index f66bb07..125238f 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -551,8 +551,6 @@ function filter_generate_aliases() { $aliases .= "#pfSnortSam tables\n"; $aliases .= "table <snort2c>\n"; - $aliases .= "table <pfSnortSamout>\n"; - $aliases .= "table <pfSnortSamin>\n"; $aliases .= "\ntable <virusprot>\n"; diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 40fb4f1..563203f 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -599,7 +599,6 @@ function install_package($package, $pkg_info = "") { write_config($changedesc); $static_output .= gettext("done.") . "\n"; update_output_window($static_output); - update_output_window($static_output); if($pkg_info['after_install_info']) update_output_window($pkg_info['after_install_info']); } @@ -764,6 +763,8 @@ function install_package_xml($pkg) { foreach($config['installedpackages']['menu'] as $amenu) if($amenu['name'] == $menu['name']) continue 2; + else + $config['installedpackages']['menu'] = array(); $config['installedpackages']['menu'][] = $menu; } $static_output .= gettext("done.") . "\n"; @@ -778,6 +779,8 @@ function install_package_xml($pkg) { foreach($config['installedpackages']['tab'] as $atab) if($atab['name'] == $tab['name']) continue 2; + else + $config['installedpackages']['tab'] = array(); $config['installedpackages']['tab'][] = $tab; } $static_output .= gettext("done.") . "\n"; @@ -792,11 +795,15 @@ function install_package_xml($pkg) { foreach($config['installedpackages']['service'] as $aservice) if($aservice['name'] == $service['name']) continue 2; + else + $config['installedpackages']['service'] = array(); $config['installedpackages']['service'][] = $service; } $static_output .= gettext("done.") . "\n"; update_output_window($static_output); } + /* XXX: Seems there are issues with packages doing things */ + write_config("Intermediate config write during package install for {$pkg_info['name']}"); /* custom commands */ $static_output .= gettext("Custom commands...") . "\n"; update_output_window($static_output); |
