diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
| commit | 7b35632e80f168d8c5f2220bf610ee7e24b81270 (patch) | |
| tree | 8facf3fa565911f056a08e38f6a5eed0f756f9c6 /abs/core-testing/LinHES-config/xconfig.sh | |
| parent | 7e10f51870aa10be3b35d7912a7b54e30f608bb8 (diff) | |
| parent | 7accc0f042acdfdca9f067b1d4011d6ac01b1a74 (diff) | |
| download | linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.zip linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.gz linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/LinHES-config/xconfig.sh')
| -rwxr-xr-x | abs/core-testing/LinHES-config/xconfig.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh index 4f5fc62..f90a60e 100755 --- a/abs/core-testing/LinHES-config/xconfig.sh +++ b/abs/core-testing/LinHES-config/xconfig.sh @@ -3,7 +3,7 @@ #SET DISPLAYRES to force Xres, ENV takes precendent over cmdline #displayres=cmdline #NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel unichrome-dri xf86-video-unichrome xf86-video-mga xf86-video-savage xf86-video-trident" -NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident" +NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident unichrome-dri xf86-video-openchrome" BASE="" . /etc/profile NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt" @@ -202,11 +202,13 @@ function setupX { then #install 96xx drivers echo "installing nvidia 96xx drivers" + pacman --noconfirm -Rd libgl > /dev/null 2>&1 pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1 else #install latest drivers echo "installing current nvidia drivers" + pacman --noconfirm -Rd libgl > /dev/null 2>&1 pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1 fi |