added remove_module in init-script.

Package-Manager: portage-2.1.4.4

3 files changed, 23 insertions, 5 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index 49c02ca498ff..636817603b6e 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/irda-utils
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.25 2008/03/22 18:34:10 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.26 2008/03/23 16:00:15 sbriesen Exp $
+
+  23 Mar 2008; Stefan Briesenick <sbriesen@gentoo.org> files/irda.initd:
+  added remove_module in init-script.
 
 *irda-utils-0.9.18-r2 (22 Mar 2008)
 
diff --git a/net-wireless/irda-utils/Manifest b/net-wireless/irda-utils/Manifest
index 80c7eb23e9b8..1039ecba8761 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -8,7 +8,7 @@ AUX irda-utils-gcc3.4-fix.patch 400 RMD160 bd8e0fd36370bf01593a7e300625244fdc91a
 AUX irda-utils-rh1.patch 444 RMD160 97a24330f9b3c639f9d53ad25008d07b59391af6 SHA1 7fbbb6438b1057eaad65597dff29a1727d09573e SHA256 725cd43b05dfc9f05f49ee8d3a81050d3421639c8440092c4d9bed5de1c31b30
 AUX irda.conf 313 RMD160 45626a6869a6e40b5da57b95c5a72b5996cc66eb SHA1 48d2ecf98c3493b658d51192db2855167d330777 SHA256 c5c014af8bef432a6d987c7199d9aaca64fe74941502914fc445aa8f2f2dd4e7
 AUX irda.confd 1082 RMD160 6907ff6b6949e936cfdca06fc9e9530c0f7acc94 SHA1 fee39f1cd33adb9e9ee9f7c4340fbc134aaee27d SHA256 bc02b109411bfe3a6d425489633955e412670e0c60a0eb6e994b578cc904a686
-AUX irda.initd 1742 RMD160 53bb6f5fdaf8d0b493a82737eccaadd181e34615 SHA1 9f8d8806535b329002deb5b85d6cbe816ab6987c SHA256 f73b693f578b9ce75f166cff07c37d06e70c800beea068a8dd386c39121ada22
+AUX irda.initd 2001 RMD160 df6b88504d3994164521badb15286ced408b9b85 SHA1 b087793d3340ed84425dd8d6abaa404d90e9912b SHA256 6038c83d602f2b9bc94bb1d23e9973f18dca28a1321e7e8cf09f2a5c147628b6
 AUX irda.modsd 1905 RMD160 f40ba079e3ab629dc0ea83628a438bde547198dd SHA1 11f244bf69592adc6fe2ca0cb259a63e313dad15 SHA256 83ad006b650e0ac3328efd3d4912c04d4ec4ed53a20d33b9169f2ca8a63a5bdd
 AUX irda.rc 993 RMD160 efdc4abacb06477ba716be8f5b079a5654bd8e7a SHA1 481afc6158f164106d98fae3a58e66732fbe53dd SHA256 30dddbc86255fc226cf49d6ea7662423654ae500a3a75a8b5e4849f5570ab2ac
 AUX irda.rules 758 RMD160 924db1ae90290525e4a4648ae40624286dcd85fe SHA1 157f85fb87b68db942319a40babec84a8e0da598 SHA256 9b53cab524748619bfb26dc05e31dfbbec267bee71acc9a07114fcbea6496cbb
@@ -19,5 +19,5 @@ EBUILD irda-utils-0.9.16-r1.ebuild 2034 RMD160 faf8118e5f8cc826de19e8167cbd4c895
 EBUILD irda-utils-0.9.17_pre5.ebuild 2096 RMD160 2e70c612abaefc6ccadeed8b1e2ca44fc3b3f312 SHA1 e64c0caccb5e548156aeeab010b0fa72995e9f54 SHA256 64f6a423fb8e69b461e283bcac1231dbcce90d3cd4579f9f6b9a5a5c617d2a6d
 EBUILD irda-utils-0.9.18-r2.ebuild 2637 RMD160 897eb4514dac065dccb3c0b456012be694e46102 SHA1 421cea52e26098d3ca66d39e9cda9482767f28ca SHA256 b0e639d927adaf388f950040f0fa3162ec04209914bc59049b96d3feafcc34df
 EBUILD irda-utils-0.9.18.ebuild 1459 RMD160 174a8319aa39beacce575145524eb9f1098cabed SHA1 6b3e0509029fd5c54fc42ac4deeb21bca407caf2 SHA256 cac3e3ffe426a455d6677d545020cdc76a77785fe4f1ef0398c48d6df6efee37
-MISC ChangeLog 5953 RMD160 6006eed9fc2685fe39ab1215e3671d6581031256 SHA1 d0b95d9291fea6d1ebee9ed93aa0b95c9cbd6d3a SHA256 ef68f7c09268d5afa55689b5b0f1926edac6898059e63b917152b93b4301fa3c
+MISC ChangeLog 6065 RMD160 5d6d82a5e2e3ad01de4dca71c3f710e1cc779320 SHA1 53fd6f3679b0b2297609f5e9d9b574801876a203 SHA256 1a8643ae7443d22f6bd70a727a312ba8f355ca5a35264975d705bca09210824c
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
diff --git a/net-wireless/irda-utils/files/irda.initd b/net-wireless/irda-utils/files/irda.initd
index 8cbf0664c998..28d9bedca8c0 100644
--- a/net-wireless/irda-utils/files/irda.initd
+++ b/net-wireless/irda-utils/files/irda.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/files/irda.initd,v 1.1 2008/03/22 18:34:11 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/files/irda.initd,v 1.2 2008/03/23 16:00:16 sbriesen Exp $
 
 # Hint: We don't use start-stop-daemon, because pidfile is the same
 # for every irattach instance. So it isn't reliable if we have more
@@ -46,6 +46,14 @@ checkconfig() {
 	esac
 }
 
+remove_module() {
+	local CNT=0
+	while ! /sbin/modprobe -sqr ${1}; do
+		[ $((CNT++)) -eq 10 ] && break
+		sleep 0.25
+	done
+}
+
 start() {
 	checkconfig
 	ebegin "Starting IrDA"
@@ -67,5 +75,12 @@ start() {
 stop() {
 	ebegin "Shutting down IrDA"
 	/usr/bin/pkill -f "^/usr/sbin/irattach ${DEVICE} ?"
-	eend ${?} || return 0  # never fail
+	eend ${?}
+
+	# Try to remove IrDA driver
+	case "${DEVICE}" in
+		/dev/ttyS*) remove_module irtty-sir;;
+		irda[0-9]*) remove_module ${DEVICE};;
+	esac
+	return 0  # never fail
 }