Changeset 58820 in vbox

Timestamp:

Nov 23, 2015 12:51:11 PM (9 years ago)

Author:

vboxsync

Message:

Additions/linux/installers: fix error reporting when the kernel module build fails, both in the installer and the service.

Location:

trunk/src/VBox

Files:

• Additions/linux/installer/vboxadd.sh (modified) (1 diff)
• Installer/linux/run-inst.sh (modified) (1 diff)

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -378 +378 @@
     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

trunk/src/VBox/Installer/linux/run-inst.sh

@@ -421 +421 @@
     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