mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
add new persistent sound code
This commit is contained in:
parent
e9f16fd078
commit
f7497319cc
1 changed files with 4 additions and 10 deletions
|
@ -4497,7 +4497,6 @@ auto_hwdetect()
|
||||||
HWDETECTMODULES=""
|
HWDETECTMODULES=""
|
||||||
HWDETECTHOOKS=""
|
HWDETECTHOOKS=""
|
||||||
HWDETECTFILES=""
|
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"
|
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
|
if [[ "${HWDETECT}" = "yes" ]]; then
|
||||||
# check on ide-legacy boot parameter
|
# check on ide-legacy boot parameter
|
||||||
|
@ -4532,27 +4531,22 @@ auto_hwdetect()
|
||||||
HWPARAMETER="${HWPARAMETER} --dmraid"
|
HWPARAMETER="${HWPARAMETER} --dmraid"
|
||||||
fi
|
fi
|
||||||
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"
|
[[ "$(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')"
|
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)"
|
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 "${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 "${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
|
[[ -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
|
# add persistent files
|
||||||
[[ -e "${DESTDIR}/etc/udev/rules.d/network_persistent.rules" ]] && rm ${DESTDIR}/etc/udev/rules.d/network_persistent.rules
|
[[ -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/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
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
auto_persistent_soundcard()
|
|
||||||
{
|
|
||||||
echo "dummy function"
|
|
||||||
}
|
|
||||||
|
|
||||||
auto_fb()
|
auto_fb()
|
||||||
{
|
{
|
||||||
UVESAFB=""
|
UVESAFB=""
|
||||||
|
|
Loading…
Reference in a new issue