From e8aef0eccc621054ebcaed2ae832cf7fbc337640 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 7 Feb 2011 17:19:33 -0500
Subject: [PATCH] minicron is now used on a number of items in the gui.  tell
 the cp prune process to use the pid name cp-prunedb.pid

---
 etc/inc/captiveportal.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 08183f0dd8..5518dee632 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -226,7 +226,7 @@ function captiveportal_configure() {
 		touch("{$g['vardb_path']}/captiveportal.db");
 
 		/* kill any running minicron */
-		killbypid("{$g['varrun_path']}/minicron.pid");
+		killbypid("{$g['varrun_path']}/cp_prunedb.pid");
 
 		/* init ipfw rules */
 		captiveportal_init_rules(true);
@@ -418,11 +418,11 @@ EOD;
 		captiveportal_init_webgui();
 
 		/* Kill any existing prunecaptiveportal processes */
-		if(file_exists("{$g['varrun_path']}/minicron.pid"))
-			killbypid("{$g['varrun_path']}/minicron.pid");
+		if(file_exists("{$g['varrun_path']}/cp_prunedb.pid"))
+			killbypid("{$g['varrun_path']}/cp_prunedb.pid");
 
 		/* start pruning process (interval defaults to 60 seconds) */
-		mwexec("/usr/local/bin/minicron $croninterval {$g['varrun_path']}/minicron.pid " .
+		mwexec("/usr/local/bin/minicron $croninterval {$g['varrun_path']}/cp_prunedb.pid " .
 			"/etc/rc.prunecaptiveportal");
 
 		/* generate radius server database */
@@ -433,7 +433,7 @@ EOD;
 
 	} else {
 		killbypid("{$g['varrun_path']}/lighty-CaptivePortal.pid");
-		killbypid("{$g['varrun_path']}/minicron.pid");
+		killbypid("{$g['varrun_path']}/cp_prunedb.pid");
 
 		captiveportal_radius_stop_all();