Changeset 63871 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Sep 16, 2016 5:52:34 PM (8 years ago)

Author:

vboxsync

Message:

bugref:3809: Linux installer maintenance: start VBoxService as soon as the Additions are installed too, if possible. See ticketref:15847.

File:

• trunk/src/VBox/Additions/linux/installer/install.sh.in (modified) (1 diff)

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -420 +420 @@
 fi
 
+"$INSTALLATION_DIR/init/vboxadd" setup 1>&2 2>> "${LOGFILE}"
+
 # Install, set up and start init scripts
-for i in "$INSTALLATION_DIR/init/vboxadd" "$INSTALLATION_DIR/init/vboxadd-service" \
-    "$INSTALLATION_DIR/init/vboxadd-x11"; do
-  if test -r "$i"; then
+for i in "$INSTALLATION_DIR/init/vboxadd" "$INSTALLATION_DIR/init/vboxadd-service"; do
     install_init_script "$i" "`basename "$i"`" 2>> "${LOGFILE}"
     addrunlevel "`basename "$i"`" 2>> "${LOGFILE}"
-    if test -n "$DO_SETUP" && grep -q '^# *setup_script *$' "${i}"; then
-        if "${i}" setup 1>&2 2>> "${LOGFILE}"; then
-            start_init_script "`basename "$i"`" 2>> "${LOGFILE}"
-        else
-            echo 1>&2 "Failed to set up service `basename "$i"`, please check the log file"
-            echo 1>&2 "${LOGFILE} for details."
-        fi
-    fi
-  fi
+    start_init_script "`basename "$i"`" 2>> "${LOGFILE}"
 done