webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix service.cgi hangs if the initscript of an addon dosn't close output

Browse Source 
improved sanedloop and sane initscript


git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1251 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
arne_f
2008-03-05 17:08:22 +00:00
parent 7f27bd5d56
commit 08efdb4f26
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/cgi-bin/services.cgi
View File

@@ -117,7 +117,7 @@ print "</table></div>\n";
my $paramstr=$ENV{QUERY_STRING}; my $paramstr=$ENV{QUERY_STRING};
my @param=split(/!/, $paramstr); my @param=split(/!/, $paramstr);
if ($param[1] ne '') { if ($param[1] ne '') {
my $temp = `/usr/local/bin/addonctrl @param[0] @param[1]`; system("/usr/local/bin/addonctrl @param[0] @param[1] > /dev/null 2>&1");
} }
print <<END print <<END

10
src/initscripts/init.d/sane
View File

@@ -19,20 +19,20 @@
case "${1}" in case "${1}" in
start) start)
boot_mesg "Starting saned - network scanner deamon..." boot_mesg "Starting saned - network scanner deamon..."
killall -s KILL -w sanedloop > /dev/null 2>&1 loadproc /usr/local/bin/sanedloop
killall -s KILL -w saned > /dev/null 2>&1
/usr/local/bin/sanedloop &
evaluate_retval evaluate_retval
;; ;;
stop) stop)
boot_mesg "Stopping saned - network scanner deamon..." boot_mesg "Stopping saned - network scanner deamon..."
killall -s KILL -w sanedloop > /dev/null 2>&1 killproc sanedloop
killall -s KILL -w saned > /dev/null 2>&1 killall -s KILL -w saned > /dev/null 2>&1
echo_ok exit 0
;; ;;
restart) restart)
${0} stop
sleep 1
${0} start ${0} start
;; ;;

5
src/scripts/sanedloop
View File

@@ -2,7 +2,4 @@
# #
# saned is intended for use with (x)inet.d so we have to recall it in a loop # saned is intended for use with (x)inet.d so we have to recall it in a loop
# #
while true; (while true; do /usr/sbin/saned -s0; done) &
do
/usr/sbin/saned -s0;
done;