aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-10-09 18:00:55 -0400
committerbmeeks8 <bmeeks8@bellsouth.net>2014-10-09 18:00:55 -0400
commitb71f5bf2a4b6cad4085f5a57cce44684e031a825 (patch)
tree4a63fe595644ca0fbd6c4a6dbcbc734612514db4 /config
parent90ef400842207bfe6dca22f9121d3e3dd3328a21 (diff)
downloadpfsense-packages-b71f5bf2a4b6cad4085f5a57cce44684e031a825.tar.gz
pfsense-packages-b71f5bf2a4b6cad4085f5a57cce44684e031a825.tar.bz2
pfsense-packages-b71f5bf2a4b6cad4085f5a57cce44684e031a825.zip
Forgot to remove reverted code & handle nanoBSD installs better.
Diffstat (limited to 'config')
-rwxr-xr-xconfig/snort/snort.inc39
1 files changed, 17 insertions, 22 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 8837bf99..4b1adc90 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -3110,6 +3110,7 @@ function snort_deinstall() {
$snortlogdir = SNORTLOGDIR;
$rcdir = RCFILEPREFIX;
$snort_rules_upd_log = SNORT_RULES_UPD_LOGFILE;
+ $mounted_rw = FALSE;
log_error(gettext("[Snort] Snort package uninstall in progress..."));
@@ -3141,27 +3142,6 @@ function snort_deinstall() {
// Delete any leftover barnyard2 PID files in /var/run
unlink_if_exists("{$g['varrun_path']}/barnyard2_*.pid");
- /* Remove our custom <service> entries from config */
- $is_dirty = FALSE;
- $pkg_serv = &$config['installedpackages']['service'];
- if (!is_array($pkg_serv))
- $pkg_serv = array();
- foreach ($pkg_serv as $key => $service) {
- if (strpos($service['name'], "snort_") !== FALSE) {
- unset($pkg_serv[$key]);
- unlink_if_exists("{$g['varrun_path']}/snort_{$service['uuid']}.disabled");
- $is_dirty = TRUE;
- continue;
- }
- if (strpos($service['name'], "barnyard2_") !== FALSE) {
- unset($pkg_serv[$key]);
- unlink_if_exists("{$g['varrun_path']}/barnyard2_{$service['uuid']}.disabled");
- $is_dirty = TRUE;
- }
- }
- if ($is_dirty)
- write_config("Snort pkg: removed all snort interface services.");
-
/* Remove all the existing Snort cron jobs. */
if (snort_cron_job_exists("snort2c", FALSE))
install_cron_job("snort2c", false);
@@ -3186,7 +3166,6 @@ function snort_deinstall() {
}
}
$config['widgets']['sequence'] = implode(",", $widgetlist);
- write_config("Snort pkg: remove Snort Dashboard Widget on package deinstall.");
}
/* See if we are to clear blocked hosts on uninstall */
@@ -3203,6 +3182,15 @@ function snort_deinstall() {
}
/**********************************************************/
+ /* If not already, set Snort conf partition to read-write */
+ /* so we can make changes there */
+ /**********************************************************/
+ if (!is_subsystem_dirty('mount')) {
+ conf_mount_rw();
+ $mounted_rw = TRUE;
+ }
+
+ /**********************************************************/
/* Test for existence of the snort directory in the PBI */
/* path. If not present, then a package "delete" */
/* operation is in progress and we need to wipe out the */
@@ -3231,6 +3219,13 @@ function snort_deinstall() {
rmdir_recursive("{$g['vardb_path']}/snort");
log_error(gettext("[Snort] The package has been removed from this system..."));
}
+
+ /**********************************************************/
+ /* We're finished with conf partition mods, return to */
+ /* read-only if we changed it */
+ /**********************************************************/
+ if ($mounted_rw == TRUE)
+ conf_mount_ro();
}
function snort_prepare_rule_files($snortcfg, $snortcfgdir) {