← Back to branch summary

~ubuntu-branches/debian/squeeze/alsa-utils/squeeze

« back to all changes in this revision

Viewing changes to debian/patches/99_debian_alsaconf_modprobe_ignoreinstall.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Jordi Mallach, Elimar Riesebieter
  • Date: 2008-06-25 10:14:09 UTC
  • mfrom: (1.2.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20080625101409-uv0q00ftzk3tisex
Tags: 1.0.16-2
http://bugs.debian.org/476728
[ Elimar Riesebieter ]
Dropped udev recommendation (closes: 476728)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/99_debian_alsaconf_modprobe_ignoreinstall.dpatch
1
 
#!/bin/sh /usr/share/dpatch/dpatch-run
2
 
##
3
 
## 99_debian_alsaconf_ignoreinstall.dpatch by Thomas Hood
4
 
##
5
 
## All lines beginning with `## DP:' are a description of the patch.
6
 
## DP: Use modprobe --ignore-install when modprobing legacy card drivers with args
7
 
 
8
 
@DPATCH@
9
 
diff -urNad alsa-utils-1.0.9/alsaconf/alsaconf.in /tmp/dpep.CMl3CX/alsa-utils-1.0.9/alsaconf/alsaconf.in
10
 
--- alsa-utils-1.0.9/alsaconf/alsaconf.in       2005-03-25 15:05:41.041891852 +0100
11
 
+++ /tmp/dpep.CMl3CX/alsa-utils-1.0.9/alsaconf/alsaconf.in      2005-03-25 15:08:01.589572000 +0100
12
 
@@ -1037,7 +1037,11 @@
13
 
 # return 0 - OK, 1 - NG, 2 - not working (irq/dma problem)
14
 
 ac_try_load () {
15
 
     test -n "$LOGFILE" && echo "$1 ${*:2}" >> "$LOGFILE"
16
 
+if [ "$kernel" = old ] ; then
17
 
     /sbin/modprobe snd-$1 ${*:2} >/dev/null 2>&1
18
 
+else
19
 
+    /sbin/modprobe --ignore-install snd-$1 ${*:2} >/dev/null 2>&1
20
 
+fi
21
 
     if $lsmod | grep -q -E '^(snd-|snd_)'$1' '; then
22
 
        : ;
23
 
     else
24
 
@@ -1076,7 +1080,11 @@
25
 
 # ac_try_capture card duplex opts
26
 
 ac_try_capture () {
27
 
     test -n "$LOGFILE" && echo "$1 ${*:2}" >> "$LOGFILE"
28
 
+if [ "$kernel" = old ] ; then
29
 
     /sbin/modprobe snd-$1 ${*:3} >/dev/null 2>&1
30
 
+else
31
 
+    /sbin/modprobe --ignore-install snd-$1 ${*:3} >/dev/null 2>&1
32
 
+fi
33
 
     if $lsmod | grep -q -E '^(snd-|snd_)'$1' '; then
34
 
        : ;
35
 
     else