summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-02-18 14:00:58 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-02-18 14:00:58 +0000
commitbf874fe6da9654d7450242be6b3d8a7eb76a56d4 (patch)
tree0f8524d5ea3a74c4ad97e1e82d9b8f6b75d4d62e /media-sound
parentDon't allow broken icon themes patch from bug 167180, applied also by upstream. (diff)
downloadgentoo-2-bf874fe6da9654d7450242be6b3d8a7eb76a56d4.tar.gz
gentoo-2-bf874fe6da9654d7450242be6b3d8a7eb76a56d4.tar.bz2
gentoo-2-bf874fe6da9654d7450242be6b3d8a7eb76a56d4.zip
Fail in case ALSA is not loaded at all (missing /proc/asound). Closes bug #102015.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/alsa-utils/ChangeLog7
-rw-r--r--media-sound/alsa-utils/files/alsasound-init-200702188
2 files changed, 13 insertions, 2 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/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
}