diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-26 20:45:17 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-26 20:45:17 (GMT) |
| commit | dca46e6ccd1f16437aaf560fe970afaf4de8b3f2 (patch) | |
| tree | 3ca6b07b4182e10a5b3d5752ada047eb7a340317 /abs/core/LinHES-config/xconfig.sh | |
| parent | bb5e626e78d20d2e027ad36f9ff87af6c531353d (diff) | |
| download | linhes_pkgbuild-dca46e6ccd1f16437aaf560fe970afaf4de8b3f2.zip linhes_pkgbuild-dca46e6ccd1f16437aaf560fe970afaf4de8b3f2.tar.gz linhes_pkgbuild-dca46e6ccd1f16437aaf560fe970afaf4de8b3f2.tar.bz2 | |
xconfig:.sh stop using nvidia-xconfig because it tended to write to much info
Diffstat (limited to 'abs/core/LinHES-config/xconfig.sh')
| -rwxr-xr-x | abs/core/LinHES-config/xconfig.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index f832e66..c796047 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -75,21 +75,13 @@ function pkg_check () { function nvidia_driver_install { echo "Installing Nvidia driver" - cp "$TEMPLATES/xorg/xorg.conf.nvidia" $BASE/etc/X11/xorg.conf.d/20-automv.conf + cp "$TEMPLATES/xorg/xorg.nvidia" $BASE/etc/X11/xorg.conf.d/20-automv.conf #install latest drivers pkg_check nvidia-utils echo "Installing current nvidia drivers" nvidia_prepare pacman --noconfirm -S nvidia nvidia-utils >> $LOGFILE 2>&1 installed=1 - - if [ \"$Xres\" = "Auto" ] - then - nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list="nvidia-auto-select" - else - eval nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list=\"${Xres}\" - fi - echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG" } @@ -169,6 +161,11 @@ function setupX { case $VGACARDTYPE in NVIDIA|nVidia|nvidia) nvidia_driver_install + if [ \"$Xres\" = "Auto" ] + then + Xres="nvidia-auto-select" + fi + if [ ${Xres} != "Auto" ] then set_res |