From be0abd92cdd3ce91a8beaafe2a9966332ff26e32 Mon Sep 17 00:00:00 2001 From: f1ori Date: Sun, 29 Aug 2010 18:15:22 +0000 Subject: [PATCH] always use kill command in initscript, after timeout elapsed and yacy didn't finished git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7082 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- addon/yacyInit.m4 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4 index 874a868ff..ff2e9d64b 100644 --- a/addon/yacyInit.m4 +++ b/addon/yacyInit.m4 @@ -260,16 +260,7 @@ ifdef(`ArchLinux', ` while [ -n "$pidno" ]; do let timeout=$timeout-1 if [ $timeout -eq 0 ]; then -define(`KILL_YACY_WITH_START_STOP_DAEMON',`dnl - start-stop-daemon --stop --pidfile $PID_FILE --oknodo -')dnl -define(`KILL_YACY_WITH_SUDO', `dnl kill -9 $pid &>/dev/null -')dnl -ifdef(`ArchLinux', KILL_YACY_WITH_SUDO())dnl -ifdef(`openSUSE', `KILL_YACY_WITH_SUDO()')dnl -ifdef(`Fedora', `KILL_YACY_WITH_SUDO()')dnl -ifdef(`Debian', `KILL_YACY_WITH_START_STOP_DAEMON()')dnl # dont forget to kill shutdown process if necessary shutdown_pid=$( ps ax | grep $shutdown_pid | awk '{ print $1 }' | grep $shutdown_pid ) if [ -n "$shutdown_pid" ] ; then