From: Roy Marples <uberlord@gentoo.org>
Date: Mon, 19 Mar 2007 21:32:12 +0000 (+0000)
Subject: Only unload snd when it's loaded, #168367 thanks to Stephan Wezel.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=adc3dbe5193c9ad39443bb0ab49d58684d2f823c;p=gentoo.git

Only unload snd when it's loaded, #168367 thanks to Stephan Wezel.
Package-Manager: portage-2.1.2.2
---

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 69f231013f2c..2eb27c833a04 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.199 2007/03/15 11:33:25 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.200 2007/03/19 21:32:12 uberlord Exp $
+
+  19 Mar 2007; Roy Marples <uberlord@gentoo.org> files/alsasound.initd:
+  Only unload snd when it's loaded, #168367 thanks to Stephan Wezel.
 
 *alsa-utils-1.0.14_rc2-r3 (15 Mar 2007)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 4865435c9efb..aa6c88dd4d93 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -26,10 +26,10 @@ AUX alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 SHA1 6d5
 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
 RMD160 16ab3f3d931436947172da8efa656d6af1635049 files/alsasound.confd 515
 SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827 files/alsasound.confd 515
-AUX alsasound.initd 6375 RMD160 ba503351f51c6a483a0eb6b0ebd40baf18286850 SHA1 dd18d536546e8ce37109f869ff0ff34ed6cc0c42 SHA256 9123b0c95e13d46e6f4b8bafdf7e8d512c91e37e0bf4d8c1320b1e5a71ab96e7
-MD5 9d249af0a5ccfb5b347676efdac7f17f files/alsasound.initd 6375
-RMD160 ba503351f51c6a483a0eb6b0ebd40baf18286850 files/alsasound.initd 6375
-SHA256 9123b0c95e13d46e6f4b8bafdf7e8d512c91e37e0bf4d8c1320b1e5a71ab96e7 files/alsasound.initd 6375
+AUX alsasound.initd 6412 RMD160 0ade3d19cf50ca1c6e2e1a051c61a2d6a65a9bec SHA1 898158e92a13c7b9bba8e34de1c0be529e01c4c9 SHA256 c85b9ebf94e720aae91d46a523c6b64a58e45f7fba19b86b16725b4f91e246e9
+MD5 eb4b8ea6a93d55029f796a9a73e77751 files/alsasound.initd 6412
+RMD160 0ade3d19cf50ca1c6e2e1a051c61a2d6a65a9bec files/alsasound.initd 6412
+SHA256 c85b9ebf94e720aae91d46a523c6b64a58e45f7fba19b86b16725b4f91e246e9 files/alsasound.initd 6412
 DIST alsa-utils-1.0.11.tar.bz2 990018 RMD160 17da9d3743a70352ae448569fbeb2f2aab3e78b0 SHA1 abc890763afb5c4e9d5a3b4a1649a0145368d389 SHA256 4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
 DIST alsa-utils-1.0.12.tar.bz2 979797 RMD160 26ff9d4fed31bdecbfeb65b09ef52c05aecba733 SHA1 ea43e407ae50ec50a00679d79c86909f895f632c SHA256 a2fb425ee6b824f2442d38ce14ce630ae8332b1f4a6eeb45bee1c0cafac725a8
 DIST alsa-utils-1.0.13.tar.bz2 980874 RMD160 2a3cd882543232f81e211d216c9e8112da3f8977 SHA1 05b460a0e7ae6519ea37240476f026b59dbc710d SHA256 d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0
@@ -67,10 +67,10 @@ EBUILD alsa-utils-1.0.14_rc2.ebuild 3025 RMD160 0fdafd51671c8b60e0fed78adac5d197
 MD5 5ccd9fda3711bbbc3c718c5b1a0b3830 alsa-utils-1.0.14_rc2.ebuild 3025
 RMD160 0fdafd51671c8b60e0fed78adac5d197677ddca3 alsa-utils-1.0.14_rc2.ebuild 3025
 SHA256 3b36bd45c61657c96f82f168f299ce6c754abbb16a213dfa94325209896bd2ef alsa-utils-1.0.14_rc2.ebuild 3025
-MISC ChangeLog 29961 RMD160 0760ad731d5ea5a371a005f30da8722432acc7bd SHA1 eaf7e2ffbfec08733c4a92d82d521fe2bc829a8c SHA256 1f0762787d87134034924ca96598f924f33a16ef922fcf486d0452663957ea63
-MD5 49e2a83fc8cf6d045795906ad9c75181 ChangeLog 29961
-RMD160 0760ad731d5ea5a371a005f30da8722432acc7bd ChangeLog 29961
-SHA256 1f0762787d87134034924ca96598f924f33a16ef922fcf486d0452663957ea63 ChangeLog 29961
+MISC ChangeLog 30103 RMD160 7a0c0918ee71bc1698c13a6f319e2c9f492899d1 SHA1 e65a7fb6d8fc253bbd8e2e2885601898dc442e6c SHA256 f6831874a9ae18c36bafc52a14a3dc796176b2f3b0f6f4f51cc19c84c0951ecd
+MD5 156280337e6e753c605bd7c75fdb56b8 ChangeLog 30103
+RMD160 7a0c0918ee71bc1698c13a6f319e2c9f492899d1 ChangeLog 30103
+SHA256 f6831874a9ae18c36bafc52a14a3dc796176b2f3b0f6f4f51cc19c84c0951ecd ChangeLog 30103
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd
index 30e4d73f01cf..4c8b8129d8b4 100644
--- a/media-sound/alsa-utils/files/alsasound.initd
+++ b/media-sound/alsa-utils/files/alsasound.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.4 2007/03/15 12:12:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.5 2007/03/19 21:32:12 uberlord Exp $
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -107,14 +107,14 @@ unload_modules_recursive() {
 unload_modules_26() {
 	# First of all, remove the snd module and all the modules depending
 	# on it, this should remove already most of ALSA modules.
-	unload_modules_recursive snd
+	lsmod | grep -q "^snd[[:space:]]" && unload_modules_recursive snd
 
 	# Then find the remaining ones, and handle them too.
 	for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do
 		unload_modules_recursive "${module}"
 	done
 
-	lsmod | grep -vq '^snd'
+	lsmod | grep -vq "^snd"
 }
 
 terminate() {