From dca46e6ccd1f16437aaf560fe970afaf4de8b3f2 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 26 Aug 2012 15:45:17 -0500
Subject: xconfig:.sh  stop using nvidia-xconfig because it tended to write to
 much info

---
 abs/core/LinHES-config/xconfig.sh | 15 ++++++---------
 1 file 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
-- 
cgit v0.12

