rc: simplify halt/reboot a bit and use synchronous halt on the console

src/etc/inc/system.inc

@@ -1662,27 +1662,30 @@ function sync_system_time() {
 
 }
 
-function system_halt()
+function system_halt($sync = false)
 {
 	system_reboot_cleanup();
 
-	mwexec("/usr/bin/nohup /usr/local/etc/rc.halt > /dev/null 2>&1 &");
-}
-
-function system_reboot() {
-	global $g;
+	$cmd ='/usr/local/etc/rc.halt > /dev/null 2>&1';
 
-	system_reboot_cleanup();
+	if (!$sync) {
+		$cmd = sprintf('/usr/bin/nohup %s &', $cmd);
+	}
 
-	mwexec("nohup /usr/local/etc/rc.reboot > /dev/null 2>&1 &");
+	mwexec($cmd);
 }
 
-function system_reboot_sync() {
-	global $g;
-
+function system_reboot($sync = false)
+{
 	system_reboot_cleanup();
 
-	mwexec("/usr/local/etc/rc.reboot > /dev/null 2>&1");
+	$cmd ='/usr/local/etc/rc.reboot > /dev/null 2>&1';
+
+	if (!$sync) {
+		$cmd = sprintf('/usr/bin/nohup %s &', $cmd);
+	}
+
+	mwexec($cmd);
 }
 
 function system_reboot_cleanup() {
@@ -1841,7 +1844,7 @@ function system_check_reset_button() {
 EOD;
 
 		reset_factory_defaults();
-		system_reboot_sync();
+		system_reboot(true);
 		exit(0);
 	}
 

src/etc/rc.initial.defaults

@@ -52,7 +52,7 @@ if (strcasecmp(chop(fgets($fp)), "y") == 0) {
 
 EOD;
 
-	system_reboot_sync();
+	system_reboot(true);
 }
 
 fclose($fp);

src/etc/rc.initial.halt

@@ -39,7 +39,7 @@ echo "\nDo you want to proceed [y|n]? ";
 
 if (strcasecmp(chop(fgets($fp)), 'y') == 0) {
 	echo "\n{$g['product_name']} will shutdown and halt system now.\n";
-	system_halt();
+	system_halt(true);
 }
 
 fclose($fp);

src/etc/rc.initial.reboot

@@ -40,7 +40,7 @@ echo "\nDo you want to proceed [y|n]? ";
 
 if (strcasecmp(chop(fgets($fp)), 'y') == 0) {
 	echo "\n{$g['product_name']} is rebooting now.\n\n";
-	system_reboot_sync();
+	system_reboot(true);
 }
 
 fclose($fp);