Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-08 01:10:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122 from Chrysostomus/master

Browse Source 
merge master
This commit is contained in:
Bernhard Landauer 2017-03-15 03:58:48 +01:00 committed by GitHub
commit 7a2a100863
4 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util-base.sh
View File

@ -283,7 +283,7 @@ install_base() {
check_for_error "packages to install: $(cat /mnt/.base | tr '\n' ' ')"
clear
basestrap ${MOUNTPOINT} $(cat /mnt/.base) 2>$ERR
check_for_error "install basepkgs" $? || { DIALOG " $_InstBseTitle " --msgbox "\n$_InstFail\n " 0 0; return 1; }
check_for_error "install basepkgs" $? || { DIALOG " $_InstBseTitle " --msgbox "\n$_InstFail\n " 0 0; HIGHLIGHT_SUB=2; return 1; }
# If root is on btrfs volume, amend mkinitcpio.conf
[[ $(lsblk -lno FSTYPE,MOUNTPOINT | awk '/ \/mnt$/ {print $1}') == btrfs ]] && sed -e '/^HOOKS=/s/\ fsck//g' -i ${MOUNTPOINT}/etc/mkinitcpio.conf && \

45
lib/util-desktop.sh
View File

@ -18,6 +18,7 @@ setup_graphics_card() {
clear
arch_chroot "mhwd -f -i pci $(cat /tmp/.driver)" 2>$ERR
check_for_error "install $(cat /tmp/.driver)" $?
touch /mnt/.video_installed
GRAPHIC_CARD=$(lspci | grep -i "vga" | sed 's/.*://' | sed 's/(.*//' | sed 's/^[ \t]*//')
@ -36,21 +37,37 @@ setup_graphics_card() {
}
setup_network_drivers() {
if [[ $(mhwd -l | awk '/network-/' | wc -l) -eq 0 ]]; then
DIALOG " $_InstNWDrv " --msgbox "\n$_InfoNWKernel\n " 0 0
else
DIALOG " $_InstGrDrv " --checklist "\n$_UseSpaceBar\n " 0 0 12 \
$(mhwd -l | awk '/network-/{print $1}' |awk '$0=$0" - off"') 2> /tmp/.network_driver || return 0
DIALOG " $_InstGrMenuDD " --menu "\n " 0 0 3 \
"1" "$_InstFree" \
"2" "$_InstProp" \
"3" "$_InstNWDrv" 2>${ANSWER} || return 0
if [[ $(cat /tmp/.driver) != "" ]]; then
clear
arch_chroot "mhwd -f -i pci $(cat /tmp/.network_driver)" 2>$ERR
check_for_error "install $(cat /tmp/.network_driver)" $? || return 1
else
DIALOG " $_ErrTitle " --msgbox "\nNo network driver selected\n " 0 0
check_for_error "No network-driver selected."
fi
fi
case $(cat ${ANSWER}) in
"1") clear
arch_chroot "mhwd -a pci free 0200" 2>$ERR
check_for_error "$FUNCNAME free" $?
;;
"2") clear
arch_chroot "mhwd -a pci nonfree 0200" 2>$ERR
check_for_error "$FUNCNAME nonfree" $?
;;
"3") if [[ $(mhwd -l | awk '/network-/' | wc -l) -eq 0 ]]; then
DIALOG " $_InstNWDrv " --msgbox "\n$_InfoNWKernel\n " 0 0
else
DIALOG " $_InstGrDrv " --checklist "\n$_UseSpaceBar\n " 0 0 12 \
$(mhwd -l | awk '/network-/{print $1}' |awk '$0=$0" - off"') 2> /tmp/.network_driver || return 0
if [[ $(cat /tmp/.driver) != "" ]]; then
clear
arch_chroot "mhwd -f -i pci $(cat /tmp/.network_driver)" 2>$ERR
check_for_error "install $(cat /tmp/.network_driver)" $? || return 1
else
DIALOG " $_ErrTitle " --msgbox "\nNo network driver selected\n " 0 0
check_for_error "No network-driver selected."
fi
fi
;;
esac
}
install_network_drivers() {

2
lib/util-menu.sh
View File

@ -199,10 +199,12 @@ install_graphics_menu() {
"1") clear
arch_chroot "mhwd -a pci free 0300" 2>$ERR
check_for_error "$_InstFree" $?
touch /mnt/.video_installed
;;
"2") clear
arch_chroot "mhwd -a pci nonfree 0300" 2>$ERR
check_for_error "$_InstProp" $?
touch /mnt/.video_installed
;;
"3") setup_graphics_card
;;

2
lib/util.sh
View File

@ -495,7 +495,7 @@ final_check() {
$(grep -qv '^#' /mnt/etc/fstab 2>/dev/null) || echo "- $_FstabCheck" >> ${CHECKLIST}
# Check if video-driver has been installed
[[ $(mhwd-gpu --check | grep valid) ]] || echo "- $_GCCheck" >> ${CHECKLIST}
[[ ! -e /mnt/.video_installed ]] && echo "- $_GCCheck" >> ${CHECKLIST}
# Check if locales have been generated
[[ $(manjaro-chroot /mnt 'locale -a' | wc -l) -ge '3' ]] || echo "- $_LocaleCheck" >> ${CHECKLIST}