root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add new persistent sound code

Browse source
This commit is contained in:
Tobias Powalowski 2011-08-07 23:32:01 +02:00
parent e9f16fd078
commit f7497319cc
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
usr/share/archboot/installer/setup
View file

@ -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=""