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

Timestamp:

Dec 12, 2012 5:01:39 PM (12 years ago)

Author:

vboxsync

Message:

Installer/linux: make VBoxHeadlessXOrg terminate the X server forcibly if it is stuck on shut-down.

File:

• trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh (modified) (1 diff)

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

@@ -206 +206 @@
   # conf_file=$2
   # log_file=$3
-  trap "kill \${PID} 2>/dev/null" ${EXIT_SIGNALS}
+  trap "kill \${PID}; sleep 5; kill -KILL \${PID} 2>/dev/null" ${EXIT_SIGNALS}
   Xorg :"${1}" -auth "${auth}" -config "${2}" -logverbose 0 -logfile /dev/null -verbose 7 > "${3}" 2>&1 &
   PID="$!"
   wait
+  exit
 }
 HEADLESS_X_ORG_SERVER_COMMAND="default_command"