Fixed alsasound to work on kernels where module support is disabled. Closes bug...

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index d591eb80fb51a645cedaa0c835ab710de253e4f4..6c8b517667dcf5052f6d2d4aab1a45441f9b43d9 100644 (file)
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.80 2004/11/29 12:28:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.81 2004/11/29 21:33:27 eradicator Exp $
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Fixed alsasound to work on kernels where module support is disabled. Closes
+  bug #72849.
 
   29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
   Added save option thanks to Ben Anderson <roothorick@new.rr.com> in bug #72771.

diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index b416a52b0f4cb7783d724f52cbaa2eaab28c532a..77f00ae5d98bc0a24364e768a8d458b6cb50c102 100644 (file)
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 28ceaea8ab23661ff42fd8221981ed43 ChangeLog 12836
+MD5 82488177a01862480cef1f04d53bdd83 ChangeLog 13003
 MD5 eaedf66281406d0a541c07417cb11d11 alsa-utils-1.0.7.ebuild 2269
 MD5 f708f7156af58c40d9e8c3c8619894f2 alsa-utils-0.9.8.ebuild 1729
 MD5 2b19b71fe7ffde4f783fc5617cb430dd alsa-utils-1.0.6.ebuild 1807
@@ -9,13 +9,13 @@ MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 3d11dd42884e1123fcacf5fb054ac5ff files/alsasound.confd 162
 MD5 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69
 MD5 954b0951b5fed9bf591abf9e7cc1963e files/alsa-modules.conf-rc 1162
-MD5 6e594c7a2760ecfafb8cde7662a79975 files/alsasound 6509
+MD5 f5718e363596e5b4c442a6cf489254ad files/alsasound 6599
 MD5 c393c831cb8bcda375cd4690e85b3495 files/digest-alsa-utils-0.9.8 69
 MD5 fb7f68ad1c0d4ad52a9de4477b47c5c8 files/digest-alsa-utils-1.0.6 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBqxX7ArHZZzCEUG0RAn+cAJwPFBoM33GLovIHA6m1n7Pwle6BgQCffbz+
-hYIjCAHMAkPOG84hjkzNKDA=
-=T4tl
+iD8DBQFBq5WpArHZZzCEUG0RAqlGAJ9Cy10lJc694ojuOvRXcr4KSedcPgCfc8+S
+dZ/ilEaKR7f4629cnvY/8KA=
+=6rMs
 -----END PGP SIGNATURE-----

diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound
index fc63f4ba1e0b63482028e982137258b8115dc005..7755fa2beefdc308195fbb33c5a4e420f8c82559 100644 (file)
--- a/media-sound/alsa-utils/files/alsasound
+++ b/media-sound/alsa-utils/files/alsasound
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.20 2004/11/29 12:28:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.21 2004/11/29 21:33:27 eradicator Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
@@ -192,17 +192,19 @@ save() {
 }
 
 start() {
-       ebegin "Loading ALSA drivers"
-       if load_modules; then
-               eend 0
-       else
-               eend 1
-               return 1
+       if [ -f /proc/modules ]; then
+               ebegin "Loading ALSA modules"
+               if load_modules; then
+                       eend 0
+               else
+                       eend 1
+                       return 1
+               fi
        fi
        
-       einfo "Restoring Mixer Levels"
+       ebegin "Restoring Mixer Levels"
        restore_mixer
-       eend 0
+       eend $?
 }
 
 stop() {
@@ -211,19 +213,20 @@ stop() {
                return 0
        fi
        
-       ebegin "Unloading ALSA"
-       terminate
-       eend 0
-
        if [ "${SAVE_ON_STOP}" = "yes" ]; then
                save
        fi
 
-       einfo "Unloading modules"
-       if unload_modules; then
-               eend 0
-       else
-               eend 1
+       ebegin "Unloading ALSA"
+       terminate
+       eend 0
+
+       if [ -f /proc/modules ]; then
+               ebegin "Unloading ALSA modules"
+               if unload_modules; then
+                       eend 0
+               else
+                       eend 1
+               fi
        fi
 }
-