From fbd5fc52a755d46ef8de775fb6474af39fd14960 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 22 Sep 2010 15:27:31 +0000
Subject: [PATCH] Bring gitsync to the new check_reload_status behaviour.

---
 etc/phpshellsessions/gitsync            | 6 +-----
 etc/rc.bootup                           | 2 +-
 usr/local/www/system_advanced_admin.php | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync
index 5efa4d7275..6f7a53f267 100644
--- a/etc/phpshellsessions/gitsync
+++ b/etc/phpshellsessions/gitsync
@@ -284,10 +284,6 @@ function post_cvssync_commands() {
 	echo "===> Upgrading configuration (if needed)...\n";
 	convert_config();
 
-	echo "===> Restarting check_reload_status...\n";
-	exec("killall check_reload_status");
-	mwexec_bg("nohup /usr/bin/nice -n20 /usr/local/sbin/check_reload_status");
-
 	echo "===> Configuring filter...";
 	exec("/etc/rc.filter_configure_sync");
 	exec("pfctl -f /tmp/rules.debug");
@@ -308,7 +304,7 @@ function post_cvssync_commands() {
 	fwrite($fd, "#!/bin/sh\n");
 	fwrite($fd, "sleep 5\n");
 	fwrite($fd, "killall php\n");
-	fwrite($fd, "touch /tmp/restart_webgui\n");
+	fwrite($fd, "/usr/local/sbin/pfSctl -c 'service restart webgui'\n");
 	fclose($fd);
 	mwexec_bg("sh /tmp/restart_lighty");
 	echo "\n";
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 3e5647bde2..dfa077feff 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -263,7 +263,7 @@ echo "done.\n";
 if($avail > 0 and $avail < 65) {
 	echo "System has less than 65 megabytes of ram {$avail}.  Delaying webConfigurator startup.\n";
 	/* start webConfigurator up on final pass */
-	touch("/tmp/restart_webgui");
+	/usr/local/sbin/pfSctl -c 'service restart webgui'
 } else {
 	/* start web server */
 	system_webgui_start();
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index e7c217b066..c3ea1a0da5 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -468,7 +468,7 @@ if ($restart_webgui) {
 	ob_flush();
 	flush();
 	log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator."));
-	touch("{$g['tmp_path']}/restart_webgui");
+	send_event("service restart webgui");
 }
 
 ?>