diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-04-19 19:52:18 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2007-04-19 19:52:18 +0000 |
| commit | b2e0ac613dc8983b4fe8f1712ccfb934cd4bf8c0 (patch) | |
| tree | 10272aa6cf62ac739fc6d5d3d03cb84a79d80c48 | |
| parent | 7d04379d25f3fcc68ad57c89195d918f9ae29ec0 (diff) | |
| download | initscripts-b2e0ac613dc8983b4fe8f1712ccfb934cd4bf8c0.tar initscripts-b2e0ac613dc8983b4fe8f1712ccfb934cd4bf8c0.tar.gz initscripts-b2e0ac613dc8983b4fe8f1712ccfb934cd4bf8c0.tar.bz2 initscripts-b2e0ac613dc8983b4fe8f1712ccfb934cd4bf8c0.tar.xz initscripts-b2e0ac613dc8983b4fe8f1712ccfb934cd4bf8c0.zip | |
use sound saving wrapper from alsa-utils; conflict with older versions (#236916)
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rwxr-xr-x | rc.d/init.d/halt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec index 6772dc8e..7f00c4ad 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -21,6 +21,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 Obsoletes: rhsound sapinit Obsoletes: hotplug Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index 2e5d8150..74bcb635 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -74,8 +74,8 @@ action $"Sending all processes the KILL signal..." /sbin/killall5 -9 # Save mixer settings, here for lack of a better place. grep -q "\(alsa\)" /proc/devices -if [ $? = 0 -a -x /usr/sbin/alsactl ]; then - action $"Saving mixer settings" alsactl store +if [ $? = 0 -a -x /sbin/salsa ]; then + action $"Saving mixer settings" /sbin/salsa -s fi # Save random seed |