Bug #137016, provide a better stop for the init script.

Package-Manager: portage-2.1.1_pre3-r1

3 files changed, 22 insertions, 14 deletions

diff --git a/sys-block/vblade/ChangeLog b/sys-block/vblade/ChangeLog
index 03c263d2ef2f..6f6e8df2e684 100644
--- a/sys-block/vblade/ChangeLog
+++ b/sys-block/vblade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/vblade
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.8 2006/07/06 23:00:36 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.9 2006/07/22 05:05:56 robbat2 Exp $
+
+  22 Jul 2006; Robin H. Johnson <robbat2@gentoo.org>
+  files/init.d-vblade.vblade0:
+  Bug #137016, provide a better stop for the init script.
 
   06 Jul 2006; Jon Hood <squinky86@gentoo.org> vblade-10.ebuild:
   Mark ~amd64 wrt bug #139270.
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 3495500d93be..853e48d143ca 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -2,17 +2,17 @@ AUX conf.d-vblade 929 RMD160 965d193ca4034302083552253b40f81bb46596d9 SHA1 a06f2
 MD5 34e059f8c29888d30558536919443b50 files/conf.d-vblade 929
 RMD160 965d193ca4034302083552253b40f81bb46596d9 files/conf.d-vblade 929
 SHA256 959b212244647776e04b1f28270b8a7fc2a6717326ee5b28e93af472f25dedcc files/conf.d-vblade 929
-AUX init.d-vblade.vblade0 2564 RMD160 53967e91746c50fae8fa65d492c7e9622be0b654 SHA1 ecc8aa136888fce76b6a3354307307b9b954dd6b SHA256 63bb733775069946b5f09203d84e50a7eb7ecbd6e07dff527fbdf96316cd581f
-MD5 937f05b17136823c2b5b51f5dce257c7 files/init.d-vblade.vblade0 2564
-RMD160 53967e91746c50fae8fa65d492c7e9622be0b654 files/init.d-vblade.vblade0 2564
-SHA256 63bb733775069946b5f09203d84e50a7eb7ecbd6e07dff527fbdf96316cd581f files/init.d-vblade.vblade0 2564
+AUX init.d-vblade.vblade0 2704 RMD160 86f21d49ea00819cf8a61bff058547363b9dcd47 SHA1 d80bb3112f75bc764212c8a2aeedbd3fa8078cd6 SHA256 08c4b1aa1e16be9d3f5b6c7a0a6b29e5f28652159c6c4dac7c1ec40c89f94eff
+MD5 e94f2b06be434ef2e5f21f41d199c67e files/init.d-vblade.vblade0 2704
+RMD160 86f21d49ea00819cf8a61bff058547363b9dcd47 files/init.d-vblade.vblade0 2704
+SHA256 08c4b1aa1e16be9d3f5b6c7a0a6b29e5f28652159c6c4dac7c1ec40c89f94eff files/init.d-vblade.vblade0 2704
 AUX vbladed 650 RMD160 559099c8cb727dbd4af8df236022ff4bd112fefd SHA1 d240e8f607dd7e5eae22ec5ccd00b00b93410e3a SHA256 d6b7ca14e28c18bff20bf6d5fb37320c425b76ae042ae7cfd984e61e887caf41
 MD5 f29d83183c32e85e0579c7325959dbaa files/vbladed 650
 RMD160 559099c8cb727dbd4af8df236022ff4bd112fefd files/vbladed 650
 SHA256 d6b7ca14e28c18bff20bf6d5fb37320c425b76ae042ae7cfd984e61e887caf41 files/vbladed 650
 DIST vblade-10.tar.gz 16689 RMD160 1899c5dc6a86f8d610b91d1e13a55274e9fdc3e6 SHA1 06a0694e0786f91c68a2335a47e8a73e9adb86a3 SHA256 70fc9b0fb6c8be089a8a04e9861b8c496a38b1f66dae2fddb22a7fb312e68521
 DIST vblade-6.tar.gz 42390
-DIST vblade-9.tar.gz 16475 RMD160 927879e477fcd661379885ac484967d4837fc696 SHA256 730103caf7fd6909684bedcd3f85acf609ce944126659215400848062215c2fe
+DIST vblade-9.tar.gz 16475 RMD160 927879e477fcd661379885ac484967d4837fc696 SHA1 88d918002b8261ce0eb8a00913a8a30e9b52b1b4 SHA256 730103caf7fd6909684bedcd3f85acf609ce944126659215400848062215c2fe
 EBUILD vblade-10.ebuild 1104 RMD160 e1c8801a6618c6a30a26d38f5055146ec2d7f6a1 SHA1 8b912c4f91e1abb88203bd64413f963eaef9cb70 SHA256 ae1c3da9eba9a9a4301b38a4377b16cfe62dad565effd0dde99f072832d47b99
 MD5 e499201cf14186f5a4a1b7a8e553426b vblade-10.ebuild 1104
 RMD160 e1c8801a6618c6a30a26d38f5055146ec2d7f6a1 vblade-10.ebuild 1104
@@ -25,10 +25,10 @@ EBUILD vblade-9.ebuild 893 RMD160 d93b7dc3098d9afd4a0577d04366e5072d014c5b SHA1
 MD5 9defea83f0fa58c0685f373de90ab120 vblade-9.ebuild 893
 RMD160 d93b7dc3098d9afd4a0577d04366e5072d014c5b vblade-9.ebuild 893
 SHA256 568601165b7728d8fe8bef7fb1ce2aea4cbd704d6c80505c843a25bc442b841c vblade-9.ebuild 893
-MISC ChangeLog 1299 RMD160 800903bbb88237c0915507605b73b5c58a0fbf02 SHA1 1e751602e08cca643b4ef41c13c2b2cca3f15373 SHA256 d02fc2c1d17d42a09fabe4b383e3ad9379bff0f620a02c61609be90f4dda6a33
-MD5 f04f8ba652291b18f1c604dd387282ad ChangeLog 1299
-RMD160 800903bbb88237c0915507605b73b5c58a0fbf02 ChangeLog 1299
-SHA256 d02fc2c1d17d42a09fabe4b383e3ad9379bff0f620a02c61609be90f4dda6a33 ChangeLog 1299
+MISC ChangeLog 1440 RMD160 17aac732ff6cfd7e061e6de850a9d0a70baf1d45 SHA1 7b6e0a09ea4ed3fbcfac9d34e10d668a0b6f641b SHA256 909653293ba76018ff1b5de7be9d249b79f995d6723897671072facffbf79c46
+MD5 a4887da91207d29eaa3fb77f1a36af05 ChangeLog 1440
+RMD160 17aac732ff6cfd7e061e6de850a9d0a70baf1d45 ChangeLog 1440
+SHA256 909653293ba76018ff1b5de7be9d249b79f995d6723897671072facffbf79c46 ChangeLog 1440
 MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
 MD5 c8bc5b7915619c3198683ce72b740321 metadata.xml 202
 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef metadata.xml 202
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0 b/sys-block/vblade/files/init.d-vblade.vblade0
index 8f4f27758f14..bb2cdc11067f 100644
--- a/sys-block/vblade/files/init.d-vblade.vblade0
+++ b/sys-block/vblade/files/init.d-vblade.vblade0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0,v 1.1 2006/01/25 06:17:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0,v 1.2 2006/07/22 05:05:56 robbat2 Exp $
 
 opts="${opts} checkconfig"
 
@@ -95,15 +95,19 @@ start() {
 	--pidfile ${pidfile} --background \
 	--make-pidfile --exec /usr/sbin/vbladed -- \
 	${shelf} ${slot} ${netif} "${src}" 
-	#${shelf} ${slot} ${netif} "${src}" 2>&1 | logger -t ${srvname} &
 	eend $?
+	
+	#${shelf} ${slot} ${netif} "${src}" 2>&1 | logger -t ${srvname} &
 }
 
 stop() {
 	ebegin "Stopping ${srvname}"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	#start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	ps -Ao pid,args |egrep "^[[:digit:]]+ /usr/sbin/vblade ${@}" | awk '{print $1}' | xargs kill
 	eend $?
+	
+	#start-stop-daemon --stop --quiet --exec /usr/sbin/vblade
 }
 
-# vim: ft=filetype=gentoo-init-d syntax=filetype=gentoo-init-d :
+# vim: ft=gentoo-init-d syntax=gentoo-init-d :
 # vim: ai sw=4 sts=4 ts=4 :