Fail in case ALSA is not loaded at all (missing /proc/asound). Closes bug #102015.

Package-Manager: portage-2.1.2-r9

3 files changed, 24 insertions, 13 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 4c0bc7deb261..c42de7d72493 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.195 2007/02/18 11:38:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.196 2007/02/18 14:00:58 flameeyes Exp $
+
+  18 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  files/alsasound-init-20070218:
+  Fail in case ALSA is not loaded at all (missing /proc/asound). Closes bug
+  #102015.
 
   18 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   files/alsasound-init-20070218:
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index d56c0c619a42..528f6dcf7bb2 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -21,10 +21,10 @@ AUX alsasound-1.0.10_rc2 7183 RMD160 7c1368905cc0fbe266e840f358a3502bbedb6d9c SH
 MD5 6e3b02ef9e95e47eb339f6a3d0d91daa files/alsasound-1.0.10_rc2 7183
 RMD160 7c1368905cc0fbe266e840f358a3502bbedb6d9c files/alsasound-1.0.10_rc2 7183
 SHA256 f9f51f35e0fafb87ac9d5f2b48835142e34bcaecc30eb28c92e2af6b16d4c083 files/alsasound-1.0.10_rc2 7183
-AUX alsasound-init-20070218 7566 RMD160 f49997e7a0cff46b62fe08357dace1a4516aba89 SHA1 e3e9157c73f20aa9214ae0b015a627c183f2b6c3 SHA256 347e4903ca74f2b151aab624d3f83b4d575a8a829c92e0d482e3bb3417b3fdd5
-MD5 4582c34b29be9f3fe2ec7bc038bfca97 files/alsasound-init-20070218 7566
-RMD160 f49997e7a0cff46b62fe08357dace1a4516aba89 files/alsasound-init-20070218 7566
-SHA256 347e4903ca74f2b151aab624d3f83b4d575a8a829c92e0d482e3bb3417b3fdd5 files/alsasound-init-20070218 7566
+AUX alsasound-init-20070218 7657 RMD160 283ed673ec6f61c3aac77957393bd84ba05ff8d2 SHA1 16105ee86f8f208526eda4ce8ec6ff6b8206bedf SHA256 0330f7c58719e5669e39224be60bb6c2a1ba09b138801785655ffd245dc9d1e8
+MD5 d7fb1248eea596adb16a18cba55f1242 files/alsasound-init-20070218 7657
+RMD160 283ed673ec6f61c3aac77957393bd84ba05ff8d2 files/alsasound-init-20070218 7657
+SHA256 0330f7c58719e5669e39224be60bb6c2a1ba09b138801785655ffd245dc9d1e8 files/alsasound-init-20070218 7657
 AUX alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 SHA1 6d5762b94bcf83b5e896300575e0a11bc49fc89d SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827
 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
 RMD160 16ab3f3d931436947172da8efa656d6af1635049 files/alsasound.confd 515
@@ -58,10 +58,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 29269 RMD160 f4bd22ce94b5733494ac25210204d2a36bbbf6a1 SHA1 b778e8397ec84f12a6550b7f4d7014c9dcd1c0f4 SHA256 048dce3d7185ad1ec0f93348dee2f8863b0a1e2565e3bd19f56274c4f6e7a97f
-MD5 c906a6457f5c882a20dc4031da6d037c ChangeLog 29269
-RMD160 f4bd22ce94b5733494ac25210204d2a36bbbf6a1 ChangeLog 29269
-SHA256 048dce3d7185ad1ec0f93348dee2f8863b0a1e2565e3bd19f56274c4f6e7a97f ChangeLog 29269
+MISC ChangeLog 29443 RMD160 2f481d1497916670fe8407ce3ade99144a2b7bb7 SHA1 4125032583ccfdb947af34f84bc776d76476b229 SHA256 2f88d47ff2570e41f9ffc78a8e84d1e733715cc6784c68612e6113af8db7af57
+MD5 ee0be0a8810d573aac55d00f29c9c733 ChangeLog 29443
+RMD160 2f481d1497916670fe8407ce3ade99144a2b7bb7 ChangeLog 29443
+SHA256 2f88d47ff2570e41f9ffc78a8e84d1e733715cc6784c68612e6113af8db7af57 ChangeLog 29443
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -87,7 +87,7 @@ SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF2Dq8AiZjviIA2XgRAv3wAJ4kVf6B7R2SmTFa8mxwOrTD8qr04gCeKXZr
-0IoUrP681WT+3410ETZ3UXE=
-=QrkY
+iD8DBQFF2FwgAiZjviIA2XgRAksdAKCgKQ3mNCiwATmlq6NnTSC8j6466ACaA5zc
+weJYouYVxxp3xNKwY3UfNng=
+=SyLg
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/files/alsasound-init-20070218 b/media-sound/alsa-utils/files/alsasound-init-20070218
index 4e858affe6a1..57be91eaa57b 100644
--- a/media-sound/alsa-utils/files/alsasound-init-20070218
+++ b/media-sound/alsa-utils/files/alsasound-init-20070218
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound-init-20070218,v 1.2 2007/02/18 11:38:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound-init-20070218,v 1.3 2007/02/18 14:00:58 flameeyes Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
@@ -230,6 +230,12 @@ start() {
 		fi
 	fi
 
+	if [[ ! -d /proc/asound ]]; then
+		eerror "ALSA failed to load."
+		eend 1
+		return 1
+	fi
+
 	[[ ${RESTORE_ON_START} == "yes" ]] && restore
 }