Index: /trunk/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- /trunk/src/VBox/Additions/linux/installer/vboxadd.sh	(revision 58819)
+++ /trunk/src/VBox/Additions/linux/installer/vboxadd.sh	(revision 58820)
@@ -378,7 +378,10 @@
     chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
 
-    setup_modules || \
+    if setup_modules; then
+        mod_succ=0
+    else
+        mod_succ=1
         show_error "Please check that you have gcc, make, the header files for your Linux kernel and possibly perl installed."
-    mod_succ="$?"
+    fi
     extra_setup
     if [ "$mod_succ" -eq "0" ]; then
Index: /trunk/src/VBox/Installer/linux/run-inst.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/run-inst.sh	(revision 58819)
+++ /trunk/src/VBox/Installer/linux/run-inst.sh	(revision 58820)
@@ -421,6 +421,12 @@
     install_init_script "$i" "`basename "$i"`" 2>> "${LOGFILE}"
     addrunlevel "`basename "$i"`" 2>> "${LOGFILE}"
-    test -n "$DO_SETUP" && grep -q '^# *setup_script *$' "${i}" && "${i}" setup 1>&2 2>> "${LOGFILE}"
-    start_init_script "`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
 done