check if video-driver was selected

merge-requests/273/head
Bernhard Landauer 8 years ago
parent 026213cf1b
commit 9a45fab347

@ -361,6 +361,8 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Install Display Server" _InstGrMenuDS="Install Display Server"
_InstGrMenuDSBody="In addition to xorg and wayland options, drivers for input devices (xf86-input-) are also listed." _InstGrMenuDSBody="In addition to xorg and wayland options, drivers for input devices (xf86-input-) are also listed."
_InstGrMenuDD="Install Display Driver" _InstGrMenuDD="Install Display Driver"
_WarnInstGr="No Display Driver selected." # translate me!
_WarnInstGr="No Display Driver selected."
_InstDEStable="Install Manjaro Desktop (stable profiles)" _InstDEStable="Install Manjaro Desktop (stable profiles)"
_InstDEGit="Install Manjaro Desktop (development profiles)" _InstDEGit="Install Manjaro Desktop (development profiles)"
_InstDE="Install unconfigured desktop environments" _InstDE="Install unconfigured desktop environments"

@ -363,6 +363,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Installer le serveur d'affichage" _InstGrMenuDS="Installer le serveur d'affichage"
_InstGrMenuDSBody="En complément des options xorg et wayland, les pilotes pour les périphériques d'entrée (xf86-input-) sont également référencés." _InstGrMenuDSBody="En complément des options xorg et wayland, les pilotes pour les périphériques d'entrée (xf86-input-) sont également référencés."
_InstGrMenuDD="Installer le pilote d'affichage" _InstGrMenuDD="Installer le pilote d'affichage"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Installer bureau Manjaro (profils stable)" _InstDEStable="Installer bureau Manjaro (profils stable)"
_InstDEGit="Installer bureau Manjaro (profils de développement)" _InstDEGit="Installer bureau Manjaro (profils de développement)"
_InstGrDE="Installer l'environnement de bureau" _InstGrDE="Installer l'environnement de bureau"

@ -361,6 +361,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Install Display Server" _InstGrMenuDS="Install Display Server"
_InstGrMenuDSBody="In addition to xorg and wayland options, drivers for input devices (xf86-input-) are also listed." _InstGrMenuDSBody="In addition to xorg and wayland options, drivers for input devices (xf86-input-) are also listed."
_InstGrMenuDD="Install Display Driver" _InstGrMenuDD="Install Display Driver"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Install Manjaro Desktop (stable profiles)" _InstDEStable="Install Manjaro Desktop (stable profiles)"
_InstDEGit="Install Manjaro Desktop (development profiles)" _InstDEGit="Install Manjaro Desktop (development profiles)"
_InstGrDE="Install Desktop environment" # translate me! _InstGrDE="Install Desktop environment" # translate me!

@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="X szerver telepítése" _InstGrMenuDS="X szerver telepítése"
_InstGrMenuDSBody="A 'xorg' és 'wayland' lehetőségek mellett , a beviteli eszközök illesztőprogramjai (xf86-input-) is szerepelnek a listán." _InstGrMenuDSBody="A 'xorg' és 'wayland' lehetőségek mellett , a beviteli eszközök illesztőprogramjai (xf86-input-) is szerepelnek a listán."
_InstGrMenuDD="Megjelenítő meghajtóprogramok telepítése" _InstGrMenuDD="Megjelenítő meghajtóprogramok telepítése"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me!
_InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me!
_InstGrDE="Install Desktop environment" # translate me! _InstGrDE="Install Desktop environment" # translate me!

@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Installa Display Server" _InstGrMenuDS="Installa Display Server"
_InstGrMenuDSBody="In aggiunta alle opzioni xorg e wayland, vengono mostrati drivers per dispositivi di input (xf86-input-)." _InstGrMenuDSBody="In aggiunta alle opzioni xorg e wayland, vengono mostrati drivers per dispositivi di input (xf86-input-)."
_InstGrMenuDD="Installazione Display Driver" _InstGrMenuDD="Installazione Display Driver"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me!
_InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me!
_InstGrDE="Install Desktop environment" # translate me! _InstGrDE="Install Desktop environment" # translate me!

@ -361,6 +361,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Instalar Servidor de Exibição" _InstGrMenuDS="Instalar Servidor de Exibição"
_InstGrMenuDSBody="Além das opções xorg e wayland, drivers para dispositivos de entrada (xf86-input-) também são listados." _InstGrMenuDSBody="Além das opções xorg e wayland, drivers para dispositivos de entrada (xf86-input-) também são listados."
_InstGrMenuDD="Instalar Driver de Vídeo" _InstGrMenuDD="Instalar Driver de Vídeo"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me!
_InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me!
_InstGrDE="Install Desktop environment" # translate me! _InstGrDE="Install Desktop environment" # translate me!

@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Instalar servidor de exibição" _InstGrMenuDS="Instalar servidor de exibição"
_InstGrMenuDSBody="Além das opções xorg e wayland, drivers para dispositivos de entrada (xf86-input-*) são fornecidos." _InstGrMenuDSBody="Além das opções xorg e wayland, drivers para dispositivos de entrada (xf86-input-*) são fornecidos."
_InstGrMenuDD="Instalar driver de vídeo" _InstGrMenuDD="Instalar driver de vídeo"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me!
_InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me!
_InstGrDE="Install Desktop environment" # translate me! _InstGrDE="Install Desktop environment" # translate me!

@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Установка оконного сервера" _InstGrMenuDS="Установка оконного сервера"
_InstGrMenuDSBody="В дополнение к xorg и wayland, в список включены драйвера для устройств ввода (xf86-input-)." _InstGrMenuDSBody="В дополнение к xorg и wayland, в список включены драйвера для устройств ввода (xf86-input-)."
_InstGrMenuDD="Установка графического драйвера" _InstGrMenuDD="Установка графического драйвера"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Установить рабочий стол Манджаро (стабильные профили)" _InstDEStable="Установить рабочий стол Манджаро (стабильные профили)"
_InstDEGit="Установить рабочий стол Манджаро (профили в разработке)" _InstDEGit="Установить рабочий стол Манджаро (профили в разработке)"
_InstGrDE="Install Desktop environment" # translate me! _InstGrDE="Install Desktop environment" # translate me!

@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Instalar servidor de pantalla" _InstGrMenuDS="Instalar servidor de pantalla"
_InstGrMenuDSBody="Además de las opciones 'xorg' y 'wayland', también se proporcionan drivers para dispositivos de entrada (xf86-input)." _InstGrMenuDSBody="Además de las opciones 'xorg' y 'wayland', también se proporcionan drivers para dispositivos de entrada (xf86-input)."
_InstGrMenuDD="Instalar driver de pantalla" _InstGrMenuDD="Instalar driver de pantalla"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me!
_InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me!
_InstGrDE="Install Desktop environment" # translate me! _InstGrDE="Install Desktop environment" # translate me!

@ -537,21 +537,26 @@ setup_graphics_card() {
DIALOG " Choose video-driver to be installed " --radiolist "$_InstDEBody\n\n$_UseSpaceBar" 0 0 12 \ DIALOG " Choose video-driver to be installed " --radiolist "$_InstDEBody\n\n$_UseSpaceBar" 0 0 12 \
$(mhwd -l | awk 'FNR>4 {print $1}' | awk 'NF' |awk '$0=$0" - off"') 2> /tmp/.driver || return 0 $(mhwd -l | awk 'FNR>4 {print $1}' | awk 'NF' |awk '$0=$0" - off"') 2> /tmp/.driver || return 0
clear if [[ $(cat /tmp/.driver) != "" ]]; then
arch_chroot "mhwd -f -i pci $(cat /tmp/.driver)" 2>$ERR clear
check_for_error "install $(cat /tmp/.driver)" $? arch_chroot "mhwd -f -i pci $(cat /tmp/.driver)" 2>$ERR
check_for_error "install $(cat /tmp/.driver)" $?
GRAPHIC_CARD=$(lspci | grep -i "vga" | sed 's/.*://' | sed 's/(.*//' | sed 's/^[ \t]*//')
GRAPHIC_CARD=$(lspci | grep -i "vga" | sed 's/.*://' | sed 's/(.*//' | sed 's/^[ \t]*//')
# All non-NVIDIA cards / virtualisation
if [[ $(echo $GRAPHIC_CARD | grep -i 'intel\|lenovo') != "" ]]; then # All non-NVIDIA cards / virtualisation
install_intel if [[ $(echo $GRAPHIC_CARD | grep -i 'intel\|lenovo') != "" ]]; then
elif [[ $(echo $GRAPHIC_CARD | grep -i 'ati') != "" ]]; then install_intel
install_ati elif [[ $(echo $GRAPHIC_CARD | grep -i 'ati') != "" ]]; then
elif [[ $(cat /tmp/.driver) == "video-nouveau" ]]; then install_ati
sed -i 's/MODULES=""/MODULES="nouveau"/' ${MOUNTPOINT}/etc/mkinitcpio.conf elif [[ $(cat /tmp/.driver) == "video-nouveau" ]]; then
sed -i 's/MODULES=""/MODULES="nouveau"/' ${MOUNTPOINT}/etc/mkinitcpio.conf
fi
check_for_error "$FUNCNAME $(cat /tmp/.driver)" "$?"
else
DIALOG " $_ErrTitle " --msgbox "$_WarnInstGr" 0 0
check_for_error "No video-driver selected."
fi fi
check_for_error "$FUNCNAME $(cat /tmp/.driver)" "$?"
} }
install_intel() { install_intel() {

Loading…
Cancel
Save