summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-07-13 16:32:25 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-07-13 16:32:25 +0000
commit54764119f27a61e97534aece012bbea86158235d (patch)
tree20000413b0277c3f5c0e57381cd92bd68768f184 /app-admin
parentClean version (diff)
downloadgentoo-2-54764119f27a61e97534aece012bbea86158235d.tar.gz
gentoo-2-54764119f27a61e97534aece012bbea86158235d.tar.bz2
gentoo-2-54764119f27a61e97534aece012bbea86158235d.zip
Closing #55504.
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/ulogd/ChangeLog5
-rw-r--r--app-admin/ulogd/files/ulogd35
2 files changed, 16 insertions, 24 deletions
diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index ffd6c91ae3bb..951a39b1f07f 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/ulogd
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.20 2004/06/24 21:41:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.21 2004/07/13 16:32:25 aliz Exp $
+
+ 13 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> files/ulogd:
+ Rewrote initscript, use killall instead of killproc. Closing #55504.
01 Jun 2004; Aron Griffis <agriffis@gentoo.org> ulogd-0.98.ebuild,
ulogd-1.01.ebuild, ulogd-1.02.ebuild:
diff --git a/app-admin/ulogd/files/ulogd b/app-admin/ulogd/files/ulogd
index e1793f87f8e4..5049ca93ed88 100644
--- a/app-admin/ulogd/files/ulogd
+++ b/app-admin/ulogd/files/ulogd
@@ -1,47 +1,36 @@
#!/sbin/runscript
-#
-# chkconfig: - 91 35
-# description: Starts and stops the ulogd daemon
-#
-# pidfile: /var/lock/samba/ulogd.pid
-# config: /usr/local/etc/ulogd.conf
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.2 2004/07/13 16:32:25 aliz Exp $
-
-#opts="start stop restart status"
+opts="reload"
depend() {
need net
}
-initService() {
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Check that ulogd.conf exists.
-[ -f /etc/ulogd.conf ] || exit 0
-
-RETVAL=0
+checkconfig() {
+ if [ ! -e /etc/ulogd.conf ]; then
+ eerror "You need /etc/ulogd.conf"
+ return 1
+ fi
}
start() {
- initService
+ checkconfig || return 1
ebegin "Starting ulogd"
start-stop-daemon --start --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
eend $?
}
stop() {
- initService
ebegin "Stopping ulogd"
start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
eend $?
}
reload() {
- initService
ebegin "Reloading ulogd.conf file"
- killproc ulogd -HUP
- RETVAL=$?
- echo
- return $RETVAL
+ killall -HUP ulogd &>/dev/null
+ eend $?
}