Changeset 72196 in vbox

Timestamp:

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

Author:

vboxsync

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

Files:

• Additions/linux/installer/vboxadd.sh (modified) (7 diffs)
• Installer/linux/routines.sh (modified) (2 diffs)
• Installer/linux/vboxdrv.sh (modified) (5 diffs)

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

@@ -127 +127 @@
     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}"
 }
 
@@ -254 +262 @@
 
     # Put the X.Org driver in place.  This is harmless if it is not needed.
-    "${INSTALL_DIR}/init/vboxadd-x11" setup 2>> "${LOG}"
+    myerr=`"${INSTALL_DIR}/init/vboxadd-x11" setup 2>&1`
+    test -z "${myerr}" || log "${myerr}"
     # Install the guest OpenGL drivers.  For now we don't support
     # multi-architecture installations
@@ -308 +317 @@
 cleanup_modules()
 {
-    log "Removing existing VirtualBox kernel modules."
     for i in ${OLDMODULES}; do
         # We no longer support DKMS, remove any leftovers.
@@ -329 +337 @@
     # This does not work for 2.4 series kernels.  How sad.
     test -n "${QUICKSETUP}" && test -f "${MODULE_DIR}/vboxguest.ko" && return 0
-    info "Building the VirtualBox Guest Additions kernel modules."
-
-    # We are allowed to do ">> $LOG" after we have called "log()" once.
+    info "Building the VirtualBox Guest Additions kernel modules.  This may take a while."
+
     log "Building the main Guest Additions module."
-    if ! $BUILDINTMP \
+    if ! myerr=`$BUILDINTMP \
         --save-module-symvers /tmp/vboxguest-Module.symvers \
         --module-source $MODULE_SRC/vboxguest \
-        --no-print-directory install >> $LOG 2>&1; then
+        --no-print-directory install 2>&1`; then
         # If check_module_dependencies.sh fails it prints a message itself.
+        log "Error building the module:"
+        module_build_log "$myerr"
         "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 &&
             info "Look at $LOG to find out what went wrong"
         return 0
     fi
-    log "Building the shared folder support module"
-    if ! $BUILDINTMP \
+    log "Building the shared folder support module."
+    if ! myerr=`$BUILDINTMP \
         --use-module-symvers /tmp/vboxguest-Module.symvers \
         --module-source $MODULE_SRC/vboxsf \
-        --no-print-directory install >> $LOG 2>&1; then
+        --no-print-directory install 2>&1`; then
+        log "Error building the module:"
+        module_build_log "$myerr"
         info  "Look at $LOG to find out what went wrong"
         return 0
     fi
-    log "Building the graphics driver module"
-    if ! $BUILDINTMP \
+    log "Building the graphics driver module."
+    if ! myerr=`$BUILDINTMP \
         --use-module-symvers /tmp/vboxguest-Module.symvers \
         --module-source $MODULE_SRC/vboxvideo \
-        --no-print-directory install >> $LOG 2>&1; then
+        --no-print-directory install 2>&1`; then
+        log "Error building the module:"
+        module_build_log "$myerr"
         info "Look at $LOG to find out what went wrong"
     fi
@@ -367 +380 @@
 create_vbox_user()
 {
-    log "Creating user for the Guest Additions."
     # This is the LSB version of useradd and should work on recent
     # distributions
@@ -380 +392 @@
     # Create udev description file
     if [ -d /etc/udev/rules.d ]; then
-        log "Creating udev rule for the Guest Additions kernel module."
         udev_call=""
         udev_app=`which udevadm 2> /dev/null`
@@ -484 +495 @@
 
     # Clean-up X11-related bits
-    "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}"
+    "${INSTALL_DIR}/init/vboxadd-x11" cleanup
 
     # Remove other files

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