--- loncom/init.d/loncontrol 2005/05/26 20:25:00 1.25 +++ loncom/init.d/loncontrol 2006/01/28 11:21:42 1.27 @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# $Id: loncontrol,v 1.25 2005/05/26 20:25:00 albertel Exp $ +# $Id: loncontrol,v 1.27 2006/01/28 11:21:42 albertel Exp $ # # The LearningOnline Network with CAPA # @@ -47,6 +47,12 @@ $ENV{'BASH_ENV'}=""; # Firewall code is based on the code in FC2 /etc/init.d/ntpd my $fw_chain = 'RH-Firewall-1-INPUT'; my $iptables = '/sbin/iptables'; + if (! -e $iptables) { + $iptables = '/usr/sbin/iptables'; + if (! -e $iptables) { + print("Unable to find iptables command\n"); + } + } my $lond_port = 5663; my $lonhttpd_port = 8080; @@ -128,10 +134,10 @@ sub stop_daemon { my $daemonpid=; chomp($daemonpid); kill TERM => $daemonpid; - sleep 2; + sleep 1; if (kill 0 => $daemonpid) { kill KILL => $daemonpid; - sleep 2; + sleep 1; if (kill 0 => $daemonpid) { print("failed to kill"); } else {