Changeset 72196 in vbox for trunk/src/VBox/Installer

Timestamp:

May 11, 2018 7:06:17 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122633

Message:

Installers/Linux: clean up logging.

• Remove strange kernel output from kernel module build log.
• Remove most non-error output, in particular, only print module build output in case of error.

Location:

trunk/src/VBox/Installer/linux

Files:

• routines.sh (modified) (2 diffs)
• vboxdrv.sh (modified) (5 diffs)

trunk/src/VBox/Installer/linux/routines.sh

@@ -45 +45 @@
 }
 
-## Writes text to standard error
+## Writes text to standard error, as standard output is masked.
 #
 # Syntax: info text
@@ -51 +51 @@
 {
     echo 1>&2 "$1"
+}
+
+## Copies standard input to standard error, as standard output is masked.
+#
+# Syntax: info text
+catinfo()
+{
+    cat 1>&2
 }
 

trunk/src/VBox/Installer/linux/vboxdrv.sh

@@ -35 +35 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
 DEVICE=/dev/vboxdrv
-LOG="/var/log/vbox-install.log"
 MODPROBE=/sbin/modprobe
 SCRIPTNAME=vboxdrv.sh
@@ -46 +45 @@
   MODPROBE="$MODPROBE --allow-unsupported-modules"
 fi
+
+setup_log()
+{
+    test -n "${LOG}" && return 0
+    # Rotate log files
+    LOG="/var/log/vbox-setup.log"
+    mv "${LOG}.3" "${LOG}.4" 2>/dev/null
+    mv "${LOG}.2" "${LOG}.3" 2>/dev/null
+    mv "${LOG}.1" "${LOG}.2" 2>/dev/null
+    mv "${LOG}" "${LOG}.1" 2>/dev/null
+}
 
 [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
@@ -110 +120 @@
 {
     lsmod | grep -q "$1[^_-]"
+}
+
+log()
+{
+    setup_log
+    echo "${1}" >> "${LOG}"
+}
+
+module_build_log()
+{
+    setup_log
+    echo "${1}" | egrep -v \
+        "^test -e include/generated/autoconf.h|^echo >&2|^/bin/false)$" \
+        >> "${LOG}"
 }
 
@@ -398 +422 @@
 {
     begin_msg "Building VirtualBox kernel modules" console
-    if ! $BUILDINTMP \
+    log "Building the main VirtualBox module."
+    if ! myerr=`$BUILDINTMP \
         --save-module-symvers /tmp/vboxdrv-Module.symvers \
         --module-source "$MODULE_SRC/vboxdrv" \
-        --no-print-directory install >> $LOG 2>&1; then
+        --no-print-directory install 2>&1`; then
         "${INSTALL_DIR}/check_module_dependencies.sh" || exit 1
+        log "Error building the module:"
+        module_build_log "$myerr"
         failure "Look at $LOG to find out what went wrong"
     fi
-    if ! $BUILDINTMP \
+    log "Building the net filter module."
+    if ! myerr=`$BUILDINTMP \
         --use-module-symvers /tmp/vboxdrv-Module.symvers \
         --module-source "$MODULE_SRC/vboxnetflt" \
-        --no-print-directory install >> $LOG 2>&1; then
+        --no-print-directory install 2>&1`; then
+        log "Error building the module:"
+        module_build_log "$myerr"
         failure "Look at $LOG to find out what went wrong"
     fi
-    if ! $BUILDINTMP \
+    log "Building the net adaptor module."
+    if ! myerr=`$BUILDINTMP \
         --use-module-symvers /tmp/vboxdrv-Module.symvers \
         --module-source "$MODULE_SRC/vboxnetadp" \
-        --no-print-directory install >> $LOG 2>&1; then
+        --no-print-directory install 2>&1`; then
+        log "Error building the module:"
+        module_build_log "$myerr"
         failure "Look at $LOG to find out what went wrong"
     fi
-    if ! $BUILDINTMP \
+    log "Building the PCI pass-through module."
+    if ! myerr=`$BUILDINTMP \
         --use-module-symvers /tmp/vboxdrv-Module.symvers \
         --module-source "$MODULE_SRC/vboxpci" \
-        --no-print-directory install >> $LOG 2>&1; then
+        --no-print-directory install 2>&1`; then
+        log "Error building the module:"
+        module_build_log "$myerr"
         failure "Look at $LOG to find out what went wrong"
     fi
@@ -475 +511 @@
     ;;
 setup)
+    test -n "${2}" && export KERN_VER="${2}"
     # Create udev rule and USB device nodes.
     ## todo Wouldn't it make more sense to install the rule to /lib/udev?  This