diff options
-rw-r--r-- | etc/inc/config.inc | 4 | ||||
-rw-r--r-- | etc/inc/filter.inc | 4 | ||||
-rw-r--r-- | etc/inc/services.inc | 10 | ||||
-rw-r--r-- | etc/inc/system.inc | 4 | ||||
-rw-r--r-- | etc/inc/util.inc | 2 | ||||
-rw-r--r-- | etc/inc/vpn.inc | 12 |
6 files changed, 18 insertions, 18 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index dc00c67..3c63b27 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -2658,7 +2658,7 @@ function system_start_ftp_helpers() { require_once("interfaces.inc"); global $config, $g; - mwexec("/usr/bin/killall ftpsesame"); + mwexec("/usr/bin/killall ftpsesame", true); /* if list */ $iflist = get_configured_interface_list(); @@ -2932,4 +2932,4 @@ function set_device_perms() { if($g['booting']) echo "."; $config = parse_config(); -?>
\ No newline at end of file +?> diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 95207c3..1599a0a 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1191,7 +1191,7 @@ function filter_nat_rules_generate() if(!$helpers) mwexec("/usr/sbin/inetd -wW -R 0 -a 127.0.0.1 /var/etc/inetd.conf"); else - mwexec("/usr/bin/killall -HUP inetd"); + mwexec("/usr/bin/killall -HUP inetd", true); if ($pptpdcfg['mode'] && $pptpdcfg['mode'] != "off") { @@ -2928,4 +2928,4 @@ function return_vpn_subnet($adr) } -?>
\ No newline at end of file +?> diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 7bc11cb..36f1692 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -79,7 +79,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']; @@ -593,7 +593,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"); + exec("/usr/bin/killall bsnmpd", true); if (isset($config['snmpd']['enable'])) { @@ -1167,7 +1167,7 @@ EODAD; } if(is_process_running("olsrd")) - mwexec("/usr/bin/killall olsrd"); + mwexec("/usr/bin/killall olsrd", true); sleep(2); @@ -1231,7 +1231,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; @@ -1257,4 +1257,4 @@ function upnp_start() { } } -?>
\ No newline at end of file +?> diff --git a/etc/inc/system.inc b/etc/inc/system.inc index c3906e5..f66dd56 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -932,7 +932,7 @@ function system_ntp_configure() { /* if openntpd is running, kill it */ while(is_process_running("ntpd")) { - exec("/usr/bin/killall ntpd"); + exec("/usr/bin/killall ntpd", true); sleep(3); } @@ -1145,7 +1145,7 @@ function enable_watchdog() { } if($install_watchdog == true) { if(is_process_running("watchdogd")) - exec("/usr/bin/killall watchdogd"); + exec("/usr/bin/killall watchdogd", true); exec("/usr/sbin/watchdogd"); } } diff --git a/etc/inc/util.inc b/etc/inc/util.inc index b10a445..8d25bbe 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -63,7 +63,7 @@ function sigkillbypid($pidfile, $sig) { /* kill a process by name */ function sigkillbyname($procname, $sig) { if(isvalidproc($procname)) - return mwexec("/usr/bin/killall -{$sig} " . escapeshellarg($procname)); + return mwexec("/usr/bin/killall -{$sig} " . escapeshellarg($procname), true); } /* kill a process by name */ diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index e849028..dc75a0e 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -65,7 +65,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"); @@ -137,7 +137,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); killbypid("{$g['varrun_path']}/dnswatch-ipsec.pid"); /* wait for racoon process to die */ @@ -788,14 +788,14 @@ EOD; /* mange racoon process */ 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"); @@ -805,7 +805,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); /* start dnswatch, if necessary */ if (count($dnswatch_list) > 0) { @@ -848,7 +848,7 @@ function vpn_ipsec_force_reload() { $ipseccfg = $config['ipsec']; /* kill racoon */ - mwexec("/usr/bin/killall racoon"); + mwexec("/usr/bin/killall racoon", true); /* wait for process to die */ sleep(4); |