Index: /trunk/src/VBox/Installer/linux/install_service/init_template.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/install_service/init_template.sh	(revision 44080)
+++ /trunk/src/VBox/Installer/linux/install_service/init_template.sh	(revision 44081)
@@ -212,5 +212,7 @@
 }
 
-type pidofproc >/dev/null 2>&1 ||
+# We prefer our own implementations of pidofproc and killproc over falling back
+# to distribution ones with unknown quirks.
+# type pidofproc >/dev/null 2>&1 ||
     pidofproc()
     {
@@ -221,5 +223,5 @@
     }
 
-type killproc >/dev/null 2>&1 ||
+# type killproc >/dev/null 2>&1 ||
     killproc()
     {
Index: /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh	(revision 44080)
+++ /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh	(revision 44081)
@@ -110,4 +110,5 @@
     available.  The default command waits until the udev event queue has
     settled.  The command may return failure to signal that it has given up.
+    No arguments may be passsed.
 
   HEADLESS_X_ORG_USERS
@@ -127,5 +128,5 @@
     command creates an authority file for each of the users in the list
     \${HEADLESS_X_ORG_USERS} and generates server configuration files for all
-    detected graphics cards.
+    detected graphics cards.  No arguments may be passed.
 
   HEADLESS_X_ORG_SERVER_COMMAND
@@ -150,9 +151,14 @@
 HEADLESS_X_ORG_LOG_FILE="${SERVICE_NAME}.log"
 HEADLESS_X_ORG_RUN_FOLDER="/var/run/${SERVICE_NAME}"
-HEADLESS_X_ORG_WAIT_FOR_PREREQUISITES="udevadm settle"  # Fails if no udevadm.
 HEADLESS_X_ORG_USERS=""
 HEADLESS_X_ORG_FIRST_DISPLAY=10
-
 X_AUTH_FILE="${HEADLESS_X_ORG_RUN_FOLDER}/xauth"
+
+default_wait_for_prerequisites()
+{
+    udevadm settle  # Fails if no udevadm.
+}
+HEADLESS_X_ORG_WAIT_FOR_PREREQUISITES="default_wait_for_prerequisites"
+
 default_pre_command()
 {
@@ -288,5 +294,5 @@
   CONFIGURATION_FILE_ESCAPED=$(echo "${CONFIGURATION_FILE}" | sed 's/\([ \%]\)/\\\1/g')
   if [ "x${do_install}" = "xinstall" ]; then
-    ../helpers/install_service --command "${SCRIPT_FOLDER}"$(basename "${SCRIPT_NAME}") --arguments "--configuration-file ${CONFIGURATION_FILE_ESCAPED}" --service-name "${SERVICE_NAME}" --description "${SERVICE_DESCRIPTION}" --enable
+    ../helpers/install_service --command "${SCRIPT_FOLDER}"$(basename "${SCRIPT_NAME}") --arguments "--conf-file ${CONFIGURATION_FILE_ESCAPED}" --service-name "${SERVICE_NAME}" --description "${SERVICE_DESCRIPTION}" --enable
   else
     ../helpers/install_service --service-name "${SERVICE_NAME}" --remove