diff options
| -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 |