--- sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d	2009-11-12 10:29:48.000000000 +0100
+++ sys-block/open-iscsi/files/iscsid	2010-03-03 15:04:00.141269494 +0100
@@ -4,6 +4,7 @@
 # $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d,v 1.1 2009/11/12 09:29:48 robbat2 Exp $
 
 opts="${opts} starttargets stoptargets restarttargets"
+PID_FILE=/var/run/iscsid.pid
 
 depend() {
 	after modules
@@ -89,12 +90,9 @@
 stop() {
 	stoptargets
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --signal HUP --stop --quiet --exec /usr/sbin/iscsid #--pidfile $PID_FILE
+	start-stop-daemon --signal TERM --stop --quiet --exec /usr/sbin/iscsid --pidfile $PID_FILE
 	eend $?
 
-	# ugly, but pid file is not removed by iscsid
-	rm -f $PID_FILE
-	
 	do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
 	eend $?
 }