Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 58584)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 58585)
@@ -21,8 +21,6 @@
 # Include sub-makefiles.
 
-# We do not install VBoxHeadlessXOrg.sh any more, so neither of these are
-# needed.
-#
-# include $(PATH_SUB_CURRENT)/install_service/Makefile.kmk
+# We do not install VBoxHeadlessXOrg.sh any more, so this is not needed.
+#
 # ifdef VBOX_WITH_TESTCASES
 #  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
Index: /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh	(revision 58584)
+++ /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh	(revision 58585)
@@ -81,8 +81,4 @@
                          file.  The default location is:
                            "${CONFIGURATION_FILE}"
-
-  --install              Install the service to run at system start-up.
-
-  --uninstall            Revert the installation done by the "--install" option.
 
   --help|--usage         Print this text.
@@ -274,5 +270,4 @@
 
 # Parse our arguments.
-do_install=""
 while [ "$#" -gt 0 ]; do
   case $1 in
@@ -291,10 +286,4 @@
       exit 0
       ;;
-    --install)
-      do_install="install"
-      ;;
-    --uninstall)
-      do_install="uninstall"
-      ;;
     *)
       banner
@@ -306,15 +295,4 @@
 
 [ -r "${CONFIGURATION_FILE}" ] && . "${CONFIGURATION_FILE}"
-
-if [ -n "${do_install}" ]; then
-  SCRIPT_FOLDER=$(cd "${SCRIPT_FOLDER}" && pwd)"/"
-  CONFIGURATION_FILE_ESCAPED=$(echo "${CONFIGURATION_FILE}" | sed 's/\([ \%]\)/\\\1/g')
-  if [ "x${do_install}" = "xinstall" ]; then
-    ${SCRIPT_FOLDER}install_service --enable -- --command "${SCRIPT_FOLDER}"$(basename "${SCRIPT_NAME}") --arguments "--conf-file ${CONFIGURATION_FILE_ESCAPED}" --service-name "${SERVICE_NAME}" --description "${SERVICE_DESCRIPTION}"
-  else
-    ${SCRIPT_FOLDER}install_service --remove -- --service-name "${SERVICE_NAME}"
-  fi
-  exit 0
-fi
 
 # Change to the root directory so we don't hold any other open.