From f7497319cc7b5265f2b3981edfb7afa8ca2a753b Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Sun, 7 Aug 2011 23:32:01 +0200
Subject: [PATCH] add new persistent sound code

---
 usr/share/archboot/installer/setup | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index b96f5ba75..54e91ee3c 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -4497,7 +4497,6 @@ auto_hwdetect()
     HWDETECTMODULES=""
     HWDETECTHOOKS=""
     HWDETECTFILES=""
-    HWDETECTRC=""
     DIALOG --yesno "PRECONFIGURATION?\n-----------------\n\nDo you want to use 'hwdetect' for:\n'/etc/rc.conf' and '/etc/mkinitcpio.conf'?\n\nThis ensures consistent ordering of your hard disk / usb controllers, network and sound devices.\n\nIt is recommended to say 'YES' here." 18 70 && HWDETECT="yes"
     if [[ "${HWDETECT}" = "yes" ]]; then
         # check on ide-legacy boot parameter
@@ -4532,27 +4531,22 @@ auto_hwdetect()
                 HWPARAMETER="${HWPARAMETER} --dmraid"
             fi
         fi
+        # add persistent net and sound options
+        HWPARAMETER="${HWPARAMETER} --net --sound"
         [[ "$(blkid -c=/dev/null -o value -s TYPE ${PART_ROOT})" = "btrfs" ]] && HWPARAMETER="${HWPARAMETER} --btrfs"
         HWDETECTMODULES="$(echo $(hwdetect ${FBPARAMETER} --hostcontroller --filesystem ${HWPARAMETER}) | sed -e 's#.*\" ##g')"
         HWDETECTHOOKS="$(hwdetect --rootdevice=${PART_ROOT} --hooks-dir=${DESTDIR}/lib/initcpio/install ${FBPARAMETER} ${HWPARAMETER} --hooks)"
-        HWDETECTRC="$(echo $(hwdetect --net --sound --blacklist ${HWPARAMETER})| sed -e 's#.*) ##g')"
         [[ -n "${HWDETECTMODULES}" ]] && sed -i -e "s/^MODULES=.*/${HWDETECTMODULES}/g" ${DESTDIR}/etc/mkinitcpio.conf
         [[ -n "${HWDETECTHOOKS}" ]] && sed -i -e "s/^HOOKS=.*/${HWDETECTHOOKS}/g" ${DESTDIR}/etc/mkinitcpio.conf
         [[ -n "${HWDETECTFILES}" ]] && sed -i -e "s#^FILES=.*#FILES=\"${HWDETECTFILES}\"#g" ${DESTDIR}/etc/mkinitcpio.conf
-        ### TODO: change blacklisting to use udev rules for network
         # add persistent files
         [[ -e "${DESTDIR}/etc/udev/rules.d/network_persistent.rules" ]] && rm ${DESTDIR}/etc/udev/rules.d/network_persistent.rules
-        #[[ -e "${DESTDIR}/etc/modprobe.d/blacklist_sound.conf" ]] && rm ${DESTDIR}/etc/modprobe.d/blacklist_sound.conf
         [[ -s "/tmp/network_persistent.rules" ]] && cp /tmp/network_persistent.rules ${DESTDIR}/etc/udev/rules.d/network_persistent.rules
-        #[[ -s "/tmp/blacklist_sound.conf" ]] && cp /tmp/blacklist_sound.conf ${DESTDIR}/etc/modprobe.d/blacklist_sound.conf
+        [[ -e "${DESTDIR}/etc/modprobe.d/sound_persistent.conf" ]] && rm ${DESTDIR}/etc/modprobe.d/sound_persistent.conf
+        [[ -s "/tmp/sound_persistent.conf" ]] && cp /tmp/sound_persistent.conf ${DESTDIR}/etc/modprobe.d/sound_persistent.conf
     fi
 }
 
-auto_persistent_soundcard()
-{
-echo "dummy function"
-}
-
 auto_fb()
 {
     UVESAFB=""