Closing #55504.

3 files changed, 18 insertions, 26 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/Manifest b/app-admin/ulogd/Manifest
index 2b15ea7f8980..a54a8e6a4892 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,10 +1,10 @@
 MD5 e5fb063b59099b61b55874c1ed223d4f ulogd-1.01.ebuild 1056
 MD5 0e689d301d890ca6050ca0485e957951 ulogd-0.98.ebuild 1125
 MD5 55aa3fdd686f8c39d30bcf5c9afb6a4e ulogd-1.02.ebuild 1086
-MD5 e54ca9107667fbbe5f1818d66e423056 ChangeLog 2110
+MD5 6d09be5eaaa8a0dad681e2d659a8f5ea ChangeLog 2239
 MD5 4653d4f3c3f1e2d58b1fc2b411b4a4b5 ulogd-0.97-r1.ebuild 1088
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 d21cc9239b60422b448ef743edaf9560 files/ulogd 755
+MD5 e5952182c592a721008cff1051d53a9c files/ulogd 735
 MD5 04005ad49c96b691ff84b1305379d3c8 files/digest-ulogd-0.97-r1 61
 MD5 7d8c6f58accc97b0ce3beb6fc172d5df files/digest-ulogd-0.98 62
 MD5 e346a1112f49dea95c9302f251dd3102 files/digest-ulogd-1.01 63
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 $?
 }