Changeset 8e745d8


Ignore:
Timestamp:
Jan 9, 2014 8:10:15 AM (3 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1
Children:
1358d9d
Parents:
13ee25d
Message:

Add the nvidia check to installer, will try nvidia-xconfig if the nvidia
driver has been loaded.

Location:
overlays/install-overlay/root
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • overlays/install-overlay/root/PCBSDStart.sh

    rb2dabfa r8e745d8  
    9999fi 
    100100 
    101 # Now run the X auto-detection 
    102 detect_x 
    103  
    104101# Now start xorg 
    105102start_xorg 
  • overlays/install-overlay/root/functions.sh

    rd0b124c r8e745d8  
    55detect_x()  
    66{ 
    7   # Check for VESA support 
     7  # First check if we are running as a VirtualBox guest 
     8  pciconf -lv | grep -q "VirtualBox" 
     9  if [ $? -eq 0 ] ; then cp /root/cardDetect/xorg.conf.virtualbox /etc/X11/xorg.conf; fi 
     10 
     11  # Check if this system has a nvidia device, and run nvidia-xconfig 
     12  kldstat | grep -q 'nvidia' 
     13  if [ $? -eq 0 ] ; then 
     14     echo "Detected NVIDIA, creating xorg.conf" 
     15     nvidia-xconfig 2>/dev/null 
     16  fi 
     17 
     18  # Check if the user requested VESA mode 
    819  xvesa="NO" 
    920  v=`/bin/kenv xvesa 2>/dev/null` 
     
    7687start_xorg() 
    7788{ 
    78   # First check if we are running as a VirtualBox guest 
    79   pciconf -lv | grep -q "VirtualBox" 
    80   if [ $? -eq 0 ] ; then cp /root/cardDetect/xorg.conf.virtualbox /etc/X11/xorg.conf; fi 
     89 
     90  # Now run the X auto-detection 
     91  detect_x 
    8192 
    8293  # Run X Now 
Note: See TracChangeset for help on using the changeset viewer.