summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-03-25 22:07:31 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-03-25 22:07:31 +0000
commit6359a8974a85cb54510d0d1099c6247188cdb7af (patch)
tree72d0bcac88d412793721762275b7156e69cce08d /etc
parentbd042586572a8a0d83475d277129608715e26560 (diff)
downloadpfsense-6359a8974a85cb54510d0d1099c6247188cdb7af.zip
pfsense-6359a8974a85cb54510d0d1099c6247188cdb7af.tar.gz
Back out kill shell code. This is not the solution to the problem at hand.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pfsense-utils.inc29
1 files changed, 1 insertions, 28 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 8c73393..9e3129f 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1447,39 +1447,12 @@ function reload_interfaces_sync() {
if($shutdown_webgui_needed == true)
touch("/tmp/restart_webgui");
- reset_terminals();
-
/* remove reloading_all trigger */
if($debug)
log_error("Removing {$g['tmp_path']}/reloading_all");
unlink_if_exists("{$g['tmp_path']}/reloading_all");
}
-function reset_terminals() {
- $tokill = split("\n", `ps awwwux | grep sh | grep initial | grep -v grep | cut -d" " -f6`);
- foreach ($tokill as $killme) {
- echo "Killing $killme <p>";
- mwexec("/bin/kill -9 $killme");
- }
- $tokill = split("\n", `ps awwwux | grep rc.banner | grep -v grep | cut -d" " -f5`);
- foreach ($tokill as $killme) {
- echo "Killing $killme <p>";
- mwexec("/bin/kill -9 $killme");
- }
- $tokill = split("\n", `ps awwwux | grep tcsh | grep -v grep | cut -d" " -f5`);
- foreach ($tokill as $killme) {
- echo "Killing $killme <p>";
- mwexec("/bin/kill -9 $killme");
- }
- $tokill = split("\n", `ps awwwux | grep "(sh)" | grep -v grep | cut -d" " -f5`);
- foreach ($tokill as $killme) {
- echo "Killing $killme <p>";
- mwexec("/bin/kill -9 $killme");
- }
-
-
-}
-
/****f* pfsense-utils/reload_all
* NAME
* reload_all - triggers a reload of all settings
@@ -1743,7 +1716,7 @@ function reload_all_sync() {
if($shutdown_webgui_needed == true)
touch("/tmp/restart_webgui");
- reset_terminals();
+
unlink_if_exists("{$g['tmp_path']}/reloading_all");
OpenPOWER on IntegriCloud