Changeset 44081 in vbox for trunk/src/VBox/Installer/linux/scripts

Timestamp:

Dec 10, 2012 2:36:06 PM (12 years ago)

Author:

vboxsync

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

82593

Message:

Installer/linux: src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh and install_service.sh fixes.

File:

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

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

@@ -110 +110 @@
     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 +128 @@
     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 +151 @@
 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 +294 @@
   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