diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-19 08:58:42 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-19 08:58:42 +0000 |
| commit | 938d0a8b57717d5b8691a3f8e88a5359d4e20d76 (patch) | |
| tree | 907d0a5312c5e86b98bb197db8393ad880ed76aa /main/sysklogd/sysklogd.initd | |
| parent | 6f89add111b93cf1ba82a68db9e37d8288987567 (diff) | |
| download | aports-938d0a8b57717d5b8691a3f8e88a5359d4e20d76.tar.bz2 aports-938d0a8b57717d5b8691a3f8e88a5359d4e20d76.tar.xz | |
main/sysklogd: update init.d script
import from gentoo
remove vserver specifics, use --signal for reload
Diffstat (limited to 'main/sysklogd/sysklogd.initd')
| -rw-r--r-- | main/sysklogd/sysklogd.initd | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/main/sysklogd/sysklogd.initd b/main/sysklogd/sysklogd.initd index 429f6391c7..f0f8384941 100644 --- a/main/sysklogd/sysklogd.initd +++ b/main/sysklogd/sysklogd.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc6,v 1.12 2007/05/01 12:49:04 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc7,v 1.1 2011/09/14 22:22:57 polynomial-c Exp $ extra_started_commands="reload" @@ -32,7 +32,7 @@ stop_daemon() { local daemon="$1" [ -z "${daemon}" ] && return 1 - + ebegin "sysklogd -> stop: ${daemon}" # syslogd can be stubborn some times (--retry 15)... start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid @@ -45,8 +45,6 @@ stop_daemon() { start() { start_daemon "syslogd" "${SYSLOGD}" || return 1 - # vservers should not start klogd - [ "$RC_SYS" = "VSERVER" ] && return 0 # klogd do not always start proper if started too early sleep 1 @@ -59,10 +57,8 @@ start() { } stop() { - if [ "$RC_SYS" != "VSERVER" ]; then - stop_daemon "klogd" || return 1 - fi - stop_daemon "syslogd" || return 1 + stop_daemon "klogd" || return 1 + stop_daemon "syslogd" || return 1 return 0 } @@ -71,9 +67,9 @@ reload() { ebegin "Reloading configuration" - start-stop-daemon --stop --signal HUP --pidfile /var/run/syslogd.pid + start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid ret=$((${ret} + $?)) - start-stop-daemon --stop --signal USR1 --pidfile /var/run/klogd.pid + start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid ret=$((${ret} + $?)) eend ${ret} |