Changeset 58585 in vbox

Timestamp:

Nov 5, 2015 3:39:41 PM (9 years ago)

Author:

vboxsync

Message:

Installers/linux (host): remove the creative and over-engineered init script handling from VBoxHeadlessXorg.sh. If anyone wishes to use it in future they will have to write their own service handling, which they would probably have had to anyway, given that the old one did not support systemd.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (1 diff)
• install_service (deleted)
• scripts/VBoxHeadlessXOrg.sh (modified) (4 diffs)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -21 +21 @@
 # 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

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

@@ -81 +81 @@
                          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 +270 @@
 
 # Parse our arguments.
-do_install=""
 while [ "$#" -gt 0 ]; do
   case $1 in
@@ -291 +286 @@
       exit 0
       ;;
-    --install)
-      do_install="install"
-      ;;
-    --uninstall)
-      do_install="uninstall"
-      ;;
     *)
       banner
@@ -306 +295 @@
 
 [ -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.