From 8f2449cb2c1b5a0c47f321ed07c24d439cc0f161 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 24 Mar 2015 17:17:46 +0000
Subject: [PATCH] fix config issue in initial setup wizard

---
 src/etc/inc/pfsense-utils.inc    |  4 ++--
 src/etc/rc.reload_all            |  1 -
 src/www/wizards/setup_wizard.xml | 25 ++++++++++++++-----------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 9025dc8a0..1b00eaea1 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -756,10 +756,10 @@ function reload_all_sync() {
 	mwexec("/usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd");
 
 	/* restart sshd */
-	send_event("service restart sshd");
+	mwexec('/usr/local/etc/rc.sshd');
 
 	/* restart webConfigurator if needed */
-	send_event("service restart webgui");
+	mwexec('/usr/local/etc/rc.restart_webgui');
 }
 
 function setup_serial_port($when = 'save', $path = '')
diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all
index d7577cf79..1da6af174 100755
--- a/src/etc/rc.reload_all
+++ b/src/etc/rc.reload_all
@@ -37,6 +37,5 @@ require_once("captiveportal.inc");
 
 log_error("rc.reload_all: Reloading all configuration settings.");
 reload_all_sync();
-sleep(2);
 log_error("rc.reload_all: Reloading filter configuration.");
 filter_configure_sync();
diff --git a/src/www/wizards/setup_wizard.xml b/src/www/wizards/setup_wizard.xml
index 1e4c018d8..1c84ccd88 100644
--- a/src/www/wizards/setup_wizard.xml
+++ b/src/www/wizards/setup_wizard.xml
@@ -571,16 +571,6 @@
 			<type>submit</type>
 		</field>
 	</fields>
-</step>
-<step>
-	<id>8</id>
-	<title>Reload in progress</title>
-	<description>
-		A reload is now in progress.  Please wait. &lt;p&gt;
-		&lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&amp;stepid=8" &gt;
-		&lt;p&gt;
-		The wizard will redirect to the next step once the reload is completed.
-	</description>
 	<stepafterformdisplay>
 		<![CDATA[
 		$config['system']['hostname'] = $config['wizardtemp']['system']['hostname'];
@@ -615,8 +605,21 @@
 		}
 		unset($config['wizardtemp']);
 		write_config();
+		]]>	
+	</stepafterformdisplay>
+</step>
+<step>
+	<id>8</id>
+	<title>Reload in progress</title>
+	<description>
+		A reload is now in progress.  Please wait. &lt;p&gt;
+		&lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&amp;stepid=8" &gt;
+		&lt;p&gt;
+		The wizard will redirect to the next step once the reload is completed.
+	</description>
+	<stepafterformdisplay>
+		<![CDATA[
 		reload_all();
-		mwexec_bg("/usr/local/etc/rc.update_bogons now");
 		]]>
 	</stepafterformdisplay>
 </step>