diff options
| author | felics@felics-tablet | 2018-02-01 11:43:48 +0100 |
|---|---|---|
| committer | felics@felics-tablet | 2018-02-01 11:43:48 +0100 |
| commit | ec9216f82330dc59481fa7944208dafec96eab53 (patch) | |
| tree | 16b7f9f257ebf33ad8e75f227e97da06290f51e7 | |
| parent | 9bfeacde079c3f4d1fd5ceefcc973a6ba8e3cc6d (diff) | |
| download | aur-ec9216f82330dc59481fa7944208dafec96eab53.tar.gz | |
Added short waiting time in initscripts stop/ force-kill logic.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | initscript_openrc | 2 | ||||
| -rw-r--r-- | initscript_sysvinit | 2 |
4 files changed, 10 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = wwwoffle-svn pkgdesc = Simple caching proxy server with special features (request, recursive fetch, subscription, modify HTML, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd. pkgver = 2.9j+svn2229 - pkgrel = 6 + pkgrel = 7 epoch = 1 url = http://www.gedanken.org.uk/software/wwwoffle/ install = wwwoffle.install @@ -37,9 +37,9 @@ pkgbase = wwwoffle-svn source = wwwoffle.install sha256sums = SKIP sha256sums = 5491ffc23ae113db4b46167883594b5bcb6f1bbd0ce11432bc45047efbd635d2 - sha256sums = fe13519cdbce667ec65a20a0f78784382e664a8f6b70c0a954db094f886ce04f + sha256sums = d9451db92f979a6573cecbab23c26b6ca8ea026ef61b22ec4b61c0c9051142e9 sha256sums = 03bebce87a0da1b383666ab7a95b9810e15f2a024c0954f09c959d342c5d9c87 - sha256sums = 93e27b8cc24e241fb575b324f339677dce4da32f99e7ecd616e4be547bf54eed + sha256sums = 62139f2b77139cf9c1ce9761e27f6b427c12cadd7a3739f28d854b8328e7c511 sha256sums = 106f4ce3de6d6ea020e8dcd8a4fd4f78ed2ae855e8a953a8783134e4d2cfba12 pkgname = wwwoffle-svn @@ -7,7 +7,7 @@ pkgname="${_pkgname}-svn" # _pkgver=2.9i epoch=1 pkgver=2.9j+svn2229 -pkgrel=6 +pkgrel=7 pkgdesc="Simple caching proxy server with special features (request, recursive fetch, subscription, modify HTML, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd." arch=('i686' 'x86_64' 'arm' 'arm64') url="http://www.gedanken.org.uk/software/wwwoffle/" @@ -58,9 +58,9 @@ sha256sums=( # 'e6341a4ec2631dc22fd5209c7e5ffe628a5832ad191d444c56aebc3837eed2ae' # Main source, release 'SKIP' # Main source, SVN '5491ffc23ae113db4b46167883594b5bcb6f1bbd0ce11432bc45047efbd635d2' # conf_d_wwwoffle - 'fe13519cdbce667ec65a20a0f78784382e664a8f6b70c0a954db094f886ce04f' # initscript_openrc + 'd9451db92f979a6573cecbab23c26b6ca8ea026ef61b22ec4b61c0c9051142e9' # initscript_openrc '03bebce87a0da1b383666ab7a95b9810e15f2a024c0954f09c959d342c5d9c87' # initscript_systemd - '93e27b8cc24e241fb575b324f339677dce4da32f99e7ecd616e4be547bf54eed' # initscript_sysvinit + '62139f2b77139cf9c1ce9761e27f6b427c12cadd7a3739f28d854b8328e7c511' # initscript_sysvinit '106f4ce3de6d6ea020e8dcd8a4fd4f78ed2ae855e8a953a8783134e4d2cfba12' # ${install} ) diff --git a/initscript_openrc b/initscript_openrc index c1ee48ec9960..689884e9e9d1 100644 --- a/initscript_openrc +++ b/initscript_openrc @@ -32,11 +32,13 @@ start() { stop() { ebegin "Stopping $(basename "${_DAEMON}")" start-stop-daemon --stop --exec "${_DAEMON}" || { + sleep 1 _pids="$(pidof "${_DAEMON}")" for _pid in ${_pids}; do kill -9 "${_pid}" &> /dev/null done } + sleep 1 _running="$(pidof "${_DAEMON}" | tr ' ' '\n' | wc -l)" if [ ${_running} -gt 0 ]; then eerror "Failed to stop or kill all ${_DAEMON} processes." diff --git a/initscript_sysvinit b/initscript_sysvinit index a1b0781e492e..fc3f72c8b3a7 100644 --- a/initscript_sysvinit +++ b/initscript_sysvinit @@ -50,10 +50,12 @@ case "$1" in kill "${_pid}" &> /dev/null done fi + sleep 1 _pids="$(pidof "${_DAEMON}")" for _pid in ${_pids}; do kill -9 "${_pid}" &> /dev/null done + sleep 1 _running="$(pidof "${_DAEMON}" | tr ' ' '\n' | wc -l)" if [ ${_running} -gt 0 ]; then echo "Failed to stop or kill all ${_DAEMON} processes." |