Mute killall commands

5 files changed, 16 insertions, 16 deletions

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 0c9e4a2..55c8894 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -75,7 +75,7 @@ function services_dhcpd_configure() {
 
 	/* kill any running dhcpd */
 	if(is_process_running("dhcpd"))
-		mwexec("killall dhcpd");
+		mwexec("killall dhcpd", true);
 
 	$syscfg = $config['system'];
 	$dhcpdcfg = $config['dhcpd'];
@@ -656,7 +656,7 @@ function services_snmpd_configure() {
 	/* kill any running snmpd */
 	sigkillbypid("{$g['varrun_path']}/snmpd.pid", "TERM");
 	if(is_process_running("bsnmpd")) 
-		exec("/usr/bin/killall bsnmpd");
+		mwexec("/usr/bin/killall bsnmpd", true);
 
 	if (isset($config['snmpd']['enable'])) {
 
@@ -1220,7 +1220,7 @@ EODAD;
 	}
 
 	if(is_process_running("olsrd"))
-		mwexec("/usr/bin/killall olsrd");
+		mwexec("/usr/bin/killall olsrd", true);
 
 	sleep(2);
 
@@ -1284,7 +1284,7 @@ function upnp_action ($action) {
 			break;
 		case "stop":
 			while((int)exec("pgrep miniupnpd | wc -l") > 0)
-				mwexec('killall miniupnpd 2>/dev/null');
+				mwexec('killall miniupnpd 2>/dev/null', true);
 			mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null');
 			mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null');
 			break;
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 10b5f6a..20559bc 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -1043,7 +1043,7 @@ function system_ntp_configure() {
 
 	/* if openntpd is running, kill it */
 	while(is_process_running("ntpd")) {
-		exec("/usr/bin/killall ntpd");
+		mwexec("/usr/bin/killall ntpd", true);
 		sleep(3);
 	}
 
@@ -1260,7 +1260,7 @@ function enable_watchdog() {
 	}
 	if($install_watchdog == true) {
 		if(is_process_running("watchdogd"))
-			exec("/usr/bin/killall watchdogd");
+			mwexec("/usr/bin/killall watchdogd", true);
 		exec("/usr/sbin/watchdogd");
 	}
 }
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 7f63088..6ac19f2 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -46,7 +46,7 @@ function sigkillbypid($pidfile, $sig) {
 
 /* kill a process by name */
 function killbyname($procname) {
-	mwexec("/usr/bin/killall " . escapeshellarg($procname));
+	mwexec("/usr/bin/killall " . escapeshellarg($procname), true);
 }
 
 /* return the subnet address given a host address and a subnet bit count */
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index ff117dc..775dee2 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -71,7 +71,7 @@ function vpn_ipsec_failover_configure() {
 	fclose($fd);
 	chmod("{$g['varetc_path']}/sasyncd.conf", 0600);
 
-	mwexec("killall sasyncd");
+	mwexec("killall sasyncd", true);
 
 	/* launch sasyncd, oh wise one */
 	/* mwexec_bg("/usr/local/sbin/sasyncd -d -v -v -v"); */
@@ -142,7 +142,7 @@ function vpn_ipsec_configure($ipchg = false) {
 		mwexec("/sbin/ifconfig enc0 destroy");
 
 		/* kill racoon */
-		mwexec("/usr/bin/killall racoon");
+		mwexec("/usr/bin/killall racoon", true);
 
 		/* wait for process to die */
 		sleep(2);
@@ -595,14 +595,14 @@ EOD;
 
 			if(is_process_running("racoon")) {
 				/* We are already online, reload */
-				mwexec("/usr/bin/killall -HUP racoon");
+				mwexec("/usr/bin/killall -HUP racoon", true);
 				/* flush SPD entries */
 				mwexec("/usr/local/sbin/setkey -FP");
 				mwexec("/usr/local/sbin/setkey -F");
 				/* load SPD */
 				mwexec("/usr/local/sbin/setkey -f {$g['varetc_path']}/spd.conf");
 				/* We are already online, reload */
-				mwexec("/usr/bin/killall -HUP racoon");
+				mwexec("/usr/bin/killall -HUP racoon", true);
 			} else {
 				/* start racoon */
 				mwexec("/usr/local/sbin/racoon -f {$g['varetc_path']}/racoon.conf");
@@ -612,7 +612,7 @@ EOD;
 				/* load SPD */
 				mwexec("/usr/local/sbin/setkey -f {$g['varetc_path']}/spd.conf");
 				/* We are already online, reload */
-				mwexec("/usr/bin/killall -HUP racoon");
+				mwexec("/usr/bin/killall -HUP racoon", true);
 			}
 		}
 	}
@@ -1079,7 +1079,7 @@ function vpn_ipsec_force_reload() {
 	mwexec("/sbin/ifconfig enc0 destroy");
 
 	/* kill racoon */
-	mwexec("/usr/bin/killall racoon");
+	mwexec("/usr/bin/killall racoon", true);
 
 	/* wait for process to die */
 	sleep(4);
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc
index bd19244..ba3464f 100644
--- a/etc/inc/vslb.inc
+++ b/etc/inc/vslb.inc
@@ -152,14 +152,14 @@ function slbd_configure() {
 	if($should_start == 1) {
 		fwrite($fd, $slbdconf);
 		fclose($fd);
-		mwexec("/usr/bin/killall -9 slbd");
+		mwexec("/usr/bin/killall -9 slbd", true);
 		sleep(2);
 		/* startup slbd pointing it's config at /var/etc/slbd.conf with a polling interval of 5 seconds */
 		mwexec("/usr/local/sbin/slbd -c{$g['varetc_path']}/slbd.conf -r5000");
 	} else {
-		mwexec("/usr/bin/killall -9 slbd");
+		mwexec("/usr/bin/killall -9 slbd", true);
 		fclose($fd);
 	}
 }
 
-?>
\ No newline at end of file
+?>