Fix base installation, install network drivers at the end of base installation

merge-requests/273/head
Chrysostomus 7 years ago
parent 5ae85137d0
commit 2a14f6eeed

@ -271,7 +271,7 @@ install_base() {
"KERNEL-spl" "-" off \
"KERNEL-zfs" "-" off 2>/tmp/.modules
[[ $(cat /tmp/.modules) == "" ]] && return 0
echo " " >> /mnt/.base
check_for_error "modules: $(cat /tmp/.modules)"
for kernel in $(cat ${PACKAGES} | grep -v "base-devel") ; do
cat /tmp/.modules | sed "s/KERNEL/\$kernel/g" | tr ' ' '\n' >> /mnt/.base
@ -327,6 +327,7 @@ install_base() {
fi
touch /mnt/.base_installed
check_for_error "base installed succesfully."
install_network_drivers
fi
fi
}

@ -11,7 +11,6 @@
# or modify it as you wish.
setup_graphics_card() {
# Main menu. Correct option for graphics card should be automatically highlighted.
DIALOG " $_InstGrDrv " --radiolist "\n$_UseSpaceBar" 0 0 12 \
$(mhwd -l | awk '/video-/{print $1}' |awk '$0=$0" - off"') 2> /tmp/.driver || return 0
@ -55,6 +54,15 @@ setup_network_drivers() {
fi
}
install_network_drivers() {
if [[ $(mhwd -l | awk '/network-/' | wc -l) -gt 0 ]]; then
for driver in $(mhwd -l | awk '/network-/{print $1}'); do
arch_chroot "mhwd -f -i pci ${driver}" 2>$ERR
check_for_error "install ${driver}" $?
done
fi
}
install_intel() {
sed -i 's/MODULES=""/MODULES="i915"/' ${MOUNTPOINT}/etc/mkinitcpio.conf

Loading…
Cancel
Save