diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2009-05-02 17:39:39 +0000 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2009-05-02 17:39:39 +0000 |
| commit | 30265d7ca120033c517379e52760d7e99e95b626 (patch) | |
| tree | 2a0661f0defb5b70c6d98d8cf657fafd84074190 /www-misc/xxv/files | |
| parent | Fix a bug in the su-to-zenmap script (bug #267322). (diff) | |
| download | historical-30265d7ca120033c517379e52760d7e99e95b626.tar.gz historical-30265d7ca120033c517379e52760d7e99e95b626.tar.bz2 historical-30265d7ca120033c517379e52760d7e99e95b626.zip | |
fixed initscript; thanks to heiliger @vdrportal.de
Package-Manager: portage-2.1.6.11/cvs/Linux i686
Diffstat (limited to 'www-misc/xxv/files')
| -rw-r--r-- | www-misc/xxv/files/xxv.utf8-v3 | 18 | ||||
| -rw-r--r-- | www-misc/xxv/files/xxv.utf8-v4 | 18 |
2 files changed, 20 insertions, 16 deletions
diff --git a/www-misc/xxv/files/xxv.utf8-v3 b/www-misc/xxv/files/xxv.utf8-v3 index cb8a3af74276..e56d4ee7df92 100644 --- a/www-misc/xxv/files/xxv.utf8-v3 +++ b/www-misc/xxv/files/xxv.utf8-v3 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v3,v 1.1 2009/04/16 00:28:31 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v3,v 1.2 2009/05/02 17:39:39 hd_brummy Exp $ RUNAS_USER="root" @@ -44,9 +44,10 @@ xxv_kill_pid() { # After unclear stop, xxvd.pid will not removed, fixed with next line if [ ! -x /etc/init.d/root ]; then - [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ] - rm ${PIDFILE} - killall xxvd 2> /dev/null + if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then + rm ${PIDFILE} + killall xxvd 2> /dev/null + fi fi } @@ -56,10 +57,11 @@ xxv_kill_initfile() { # After unclear stop, init file in /var/lib/init.d/started/ still not removed if [ ! -x /etc/init.d/root ]; then - [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ] - rm /var/lib/init.d/started/xxv - /etc/init.d/xxv zap - killall xxvd 2> /dev/null + if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then + rm /var/lib/init.d/started/xxv + /etc/init.d/xxv zap + killall xxvd 2> /dev/null + fi fi } diff --git a/www-misc/xxv/files/xxv.utf8-v4 b/www-misc/xxv/files/xxv.utf8-v4 index f0d6a4890c0d..c1f3d0b8ead3 100644 --- a/www-misc/xxv/files/xxv.utf8-v4 +++ b/www-misc/xxv/files/xxv.utf8-v4 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v4,v 1.1 2009/05/02 13:11:44 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v4,v 1.2 2009/05/02 17:39:39 hd_brummy Exp $ RUNAS_USER="vdr" @@ -41,9 +41,10 @@ xxv_kill_pid() { # After unclear stop, xxvd.pid will not removed, fixed with next line if [ ! -x /etc/init.d/root ]; then - [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ] - rm ${PIDFILE} - killall xxvd 2> /dev/null + if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then + rm ${PIDFILE} + killall xxvd 2> /dev/null + fi fi } @@ -53,10 +54,11 @@ xxv_kill_initfile() { # After unclear stop, init file in /var/lib/init.d/started/ still not removed if [ ! -x /etc/init.d/root ]; then - [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ] - rm /var/lib/init.d/started/xxv - /etc/init.d/xxv zap - killall xxvd 2> /dev/null + if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then + rm /var/lib/init.d/started/xxv + /etc/init.d/xxv zap + killall xxvd 2> /dev/null + fi fi } |