summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>1999-10-04 15:44:15 +0000
committerBill Nottingham <notting@redhat.com>1999-10-04 15:44:15 +0000
commita7a7ec544cbbe106de987a178293a522cf9ff90f (patch)
tree858133b46739e56e8f96e77dc7a6b5217c3981bb
parentad0bcdcfb4b64fbb4f1158d013572a3bffa1f53f (diff)
downloadinitscripts-a7a7ec544cbbe106de987a178293a522cf9ff90f.tar.gz
initscripts-a7a7ec544cbbe106de987a178293a522cf9ff90f.tar.xz
initscripts-a7a7ec544cbbe106de987a178293a522cf9ff90f.zip
check for aumix-minimal before execution
-rwxr-xr-xrc.d/init.d/halt2
-rwxr-xr-xrc.d/rc.sysinit2
2 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 8fd08c6d..3922e008 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -52,7 +52,7 @@ halt -w
# Save mixer settings, here for lack of a better place.
grep -q "\(sparcaudio\|sound\)" /proc/devices
-if [ $? = 0 ]; then
+if [ $? = 0 -a -x /bin/aumix-minimal ]; then
runcmd "Saving mixer settings" /bin/aumix-minimal -f /etc/.aumixrc -S
fi
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 928e0779..b2d2abfa 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -275,7 +275,7 @@ if [ -n "$USEMODULES" ]; then
action "Loading sound module" modprobe sound
fi
# Get mixer settings
- if [ $? -eq 0 -a -f /etc/.aumixrc ]; then
+ if [ $? -eq 0 -a -f /etc/.aumixrc -a -x /bin/aumix-minimal ]; then
action "Loading mixer settings" /bin/aumix-minimal -f /etc/.aumixrc -L >/dev/null
fi
if grep -s -q "^alias midi " /etc/conf.modules ; then