diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-10-30 10:07:07 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-10-30 10:07:07 -0400 |
| commit | 2f9361014f72bc6d53b95738048278d87978227d (patch) | |
| tree | d15cf9c4369c37381ba6fe3b257316d12396f718 | |
| parent | 33edcfbe273ca11217f47fd031ee7e8b3e23e0e7 (diff) | |
| download | initscripts-2f9361014f72bc6d53b95738048278d87978227d.tar initscripts-2f9361014f72bc6d53b95738048278d87978227d.tar.gz initscripts-2f9361014f72bc6d53b95738048278d87978227d.tar.bz2 initscripts-2f9361014f72bc6d53b95738048278d87978227d.tar.xz initscripts-2f9361014f72bc6d53b95738048278d87978227d.zip | |
Fix code that causes a syntax error on multiple cards. (#469156)
Just remove the compatibility case, and conflict with older alsa-utils
that would require it.
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/init.d/halt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec index d38d7c7b..c6ec6c32 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -33,7 +33,7 @@ Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 Conflicts: xorg-x11, glib2 < 2.11.1-2 -Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7 +Conflicts: alsa-utils < 1.0.18 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 Obsoletes: hotplug diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index f88c04ab..5dac7adc 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -78,8 +78,6 @@ action $"Sending all processes the KILL signal..." /sbin/killall5 -9 # Save mixer settings, here for lack of a better place. if [ -s /etc/alsa/alsactl.conf -a -x /sbin/alsactl ]; then action $"Saving mixer settings" /sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --ignore store -elif [ -r /proc/asound/card[0123456789] -a -x /sbin/salsa ]; then - action $"Saving mixer settings" /sbin/salsa -s fi # Save random seed |