Changeset 68705 in vbox

Timestamp:

Sep 8, 2017 3:06:08 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: clean up log file handling.
bugref:3809: Linux installer maintenance

Only rotate the Additions set-up log file if we actually have something to
log, and clean up a reference to a no-longer-existing log file.

Location:

trunk/src/VBox/Additions/linux/installer

Files:

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

-              r68684
+              r68705
 PATH=$PATH:/bin:/sbin:/usr/sbin
-LOG="/var/log/vboxadd-install-x11.log"
 CONFIG_DIR="/var/lib/VBoxGuestAdditions"
 CONFIG="${CONFIG_DIR}/config"
 …
     # And set up VBoxClient to start when the X session does
     install_x11_startup_app "${lib_dir}/98vboxadd-xclient" "${lib_dir}/vboxclient.desktop" VBoxClient VBoxClient-all ||
         fail "See the log file $LOG for more information."
+        fail "Failed to set up VBoxClient to start automatically."
     ln -s "${lib_dir}/98vboxadd-xclient" /usr/bin/VBoxClient-all 2>/dev/null
+}

-              r67736
+              r68705
 QUIET=
+# Rotate log files
+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
+setup_log()
+{
+    test -n "${LOG}" && return 0
+    # Rotate log files
+    LOG="/var/log/vboxadd-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
+}
 if $MODPROBE -c 2>/dev/null | grep -q '^allow_unsupported_modules  *0'; then
 …
 log()
+{
+    setup_log
     echo "${1}" >> "${LOG}"
+}
 …
     info "Building the VirtualBox Guest Additions kernel modules."
+    # We are allowed to do ">> $LOG" after we have called "log()" once.
     log "Building the main Guest Additions module."
     if ! $BUILDINTMP \

Note: See TracChangeset for help on using the changeset viewer.