From 289ad5f6a672803db19df76d11f8ab2056405bf3 Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Thu, 20 Aug 2009 02:41:19 +0200
Subject: [PATCH] rc.d/mixer: save state for all /dev/mixer*

Recent devfs changes created numbered mixers in /dev.  This commit
allows to save the state of all mixers and also restores them correctly.
---
 etc/rc.d/mixer | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/etc/rc.d/mixer b/etc/rc.d/mixer
index e185570d42..5af99aea36 100644
--- a/etc/rc.d/mixer
+++ b/etc/rc.d/mixer
@@ -20,7 +20,7 @@ mixer_start()
 {
 	if [ -r $mixer_conf ]; then
 		echo "Loading mixer settings"
-		cat $mixer_conf| xargs mixer 
+		xargs -L 1 mixer < $mixer_conf
 	fi
 }
 
@@ -29,7 +29,10 @@ mixer_stop()
 	[ -z "$mixer_conf" ] && return
 	if [ -w $mixer_conf -o \( ! -e $mixer_conf -a -w `dirname $mixer_conf` \) ]; then
 		echo "Storing mixer settings"
-		mixer -s > $mixer_conf
+		> $mixer_conf
+		for f in /dev/mixer[0-9]*; do
+			printf "-f %s %s\n" "$f" "$(mixer -f "$f" -s)" >> $mixer_conf
+		done
 	fi
 }
 
-- 
2.11.4.GIT