Changeset 46352 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

May 31, 2013 9:07:53 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86145

Message:

Installer/linux/headlessxorg: a number of updates.

File:

• trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh (modified) (4 diffs)

trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh

@@ -152 +152 @@
 HEADLESS_X_ORG_RUN_FOLDER="/var/run/${SERVICE_NAME}"
 HEADLESS_X_ORG_USERS=""
-HEADLESS_X_ORG_FIRST_DISPLAY=10
+HEADLESS_X_ORG_FIRST_DISPLAY=40
 X_AUTH_FILE="${HEADLESS_X_ORG_RUN_FOLDER}/xauth"
 
 default_wait_for_prerequisites()
 {
-    udevadm settle  # Fails if no udevadm.
+    udevadm settle || udevsettle # Fails if no udevadm.
 }
 HEADLESS_X_ORG_WAIT_FOR_PREREQUISITES="default_wait_for_prerequisites"
@@ -163 +163 @@
 default_pre_command()
 {
-  # Create and duplicate the authority file.
+  # Create new authority file.
   echo > "${X_AUTH_FILE}"
-  key="$(dd if=/dev/urandom count=1 bs=16 2>/dev/null | od -An -x)"
-  xauth -f "${X_AUTH_FILE}" add :0 . "${key}"
-  for i in ${HEADLESS_X_ORG_USERS}; do
-    cp "${X_AUTH_FILE}" "${X_AUTH_FILE}.${i}"
-    chown "${i}" "${X_AUTH_FILE}.${i}"
-  done
   # Create the xorg.conf files.
   mkdir -p "${HEADLESS_X_ORG_CONFIGURATION_FOLDER}" || return 1
@@ -176 +170 @@
   for i in /sys/bus/pci/devices/*; do
     read class < "${i}/class"
-    case ${class} in *03????)
+    case "${class}" in *03????)
       address="${i##*/}"
       address="${address%%:*}${address#*:}"
       address="PCI:${address%%.*}:${address#*.}"
-      cat > "${HEADLESS_X_ORG_CONFIGURATION_FOLDER}/xorg.conf.${display}" << EOF
+      read vendor < "${i}/vendor"
+      case "${vendor}" in *10de|*10DE)  # NVIDIA
+        cat > "${HEADLESS_X_ORG_CONFIGURATION_FOLDER}/xorg.conf.${display}" << EOF
+Section "Module"
+    Load       "glx"
+EndSection
+Section "Device"
+    Identifier "Device${display}"
+    Driver     "nvidia"
+    Option     "UseDisplayDevice" "none"
+EndSection
 Section "Screen"
     Identifier "Screen${display}"
+    Device     "Device${display}"
 EndSection
 Section "ServerLayout"
@@ -194 +199 @@
 EndSection
 EOF
-    display=`expr ${display} + 1`
+      esac
+      # Add key to the authority file.
+      key="$(dd if=/dev/urandom count=1 bs=16 2>/dev/null | od -An -x)"
+      xauth -f "${X_AUTH_FILE}" add :${display} . "${key}"
+      display=`expr ${display} + 1`
     esac
+  done
+  # Duplicate the authority file.
+  for i in ${HEADLESS_X_ORG_USERS}; do
+    cp "${X_AUTH_FILE}" "${X_AUTH_FILE}.${i}"
+    chown "${i}" "${X_AUTH_FILE}.${i}"
   done
 }