diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-18 12:10:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-18 12:10:55 +0100 |
| commit | 3924a249dd3ed08da0e7a6c9872d3cbeef115c22 (patch) | |
| tree | f403829261e8e6b6051aacceb0a644cb53c7f61a | |
| parent | ba38c92e6984cb2fbd544204f92b8727fb549f92 (diff) | |
| download | alsa-utils-3924a249dd3ed08da0e7a6c9872d3cbeef115c22.tar.gz | |
alsaconf - prefer /etc/modprobe.d/sound/50-sound.conf
For recent module-init-tools, prefer /etc/modprobe.d/50-sound.conf
instead of /etc/modprobe.d/sound. The latest m-i-t version will
complain (and can ignore) files that don't follow the format.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsaconf/alsaconf.in | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in index 6e9ff75..ccc1b37 100644 --- a/alsaconf/alsaconf.in +++ b/alsaconf/alsaconf.in @@ -291,6 +291,8 @@ esac # cfgfile = base config file to remove/update the sound setting # cfgout = new config file to write the sound setting (if different from $cfgfile) +cfgout="" +cfgoldout="" if [ -n "$cfgfile" ]; then if [ ! -r "$cfgfile" ]; then xecho "ERROR: The config file doesn't exist: " @@ -301,10 +303,22 @@ else if [ "$distribution" = "gentoo" ]; then cfgfile="/etc/modules.d/alsa" elif [ "$kernel" = "new" ]; then + cfgfile="/etc/modprobe.conf" if [ -d /etc/modprobe.d ]; then - cfgout="/etc/modprobe.d/sound" + cfgout="/etc/modprobe.d/50-sound.conf" + cfgoldout="/etc/modprobe.d/sound" + if [ ! -f $cfgout ]; then + modver=$(modprobe -V | sed -e's/^module-init-tools version //') + case "$modver" in + 3.[789]*) + ;; + *) + cfgout="/etc/modprobe.d/sound" + cfgoldout="" + ;; + esac + fi fi - cfgfile="/etc/modprobe.conf" elif [ "$distribution" = "debian" ]; then cfgfile="/etc/modutils/sound" elif [ -e /etc/modules.conf ]; then @@ -818,7 +832,7 @@ ac_config_card () { msg=$(xmsg " Configuring %s Do you want to modify %s (and %s if present)?" $CARD_DRIVER $cfgout $cfgfile) - $DIALOG --yesno "$msg" 8 50 || acex 0 + $DIALOG --yesno "$msg" 10 50 || acex 0 else msg=$(xmsg " Configuring %s @@ -875,6 +889,7 @@ alias sound-slot-0 $CARD_DRIVER" >> $addcfg if [ -n "$cfgout" ]; then [ ! -r "$cfgfile" ] || cmp -s "$TMP" "$cfgfile" || cat "$TMP" > "$cfgfile" cmp -s "$addcfg" "$cfgout" || cat "$addcfg" > "$cfgout" + test -n "$cfgoldout" && rm -f "$cfgoldout" else echo "$ACB # --- ALSACONF version $version ---" >> $TMP |