Changeset 99525 in vbox

Timestamp:

Apr 24, 2023 5:34:07 PM (19 months ago)

Author:

vboxsync

Message:

Additions: Linux: rcvboxadd: more reshuffling in reload area to make logging more consistent, bugref:10359.

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (modified) (4 diffs)

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

@@ -997 +997 @@
         if [ $? -ne 0 ]; then
             # Was module loaded?
-            [ -n "$mod_is_running" ] || fail "module $mod is not loaded"
-            # If module was loaded it means that it has incorrect version.
-            fail "currently loaded module $mod version ($(running_module_version "$mod")) does not match to VirtualBox Guest Additions installation version ($VBOX_VERSION $VBOX_REVISION)"
+            if [ -z "$mod_is_running" ]; then
+                info "module $mod is not loaded"
+            else
+                # If module was loaded it means that it has incorrect version.
+                info "currently loaded module $mod version ($(running_module_version "$mod")) does not match to VirtualBox Guest Additions installation version ($VBOX_VERSION $VBOX_REVISION)"
+            fi
+
+            # Set "bad" rc.
+            false
         fi
 
@@ -1140 +1146 @@
 
         # Reload VBoxClient processes.
-        [ $? -eq 0 ] && try_load_preserve_rc "send_signal "-USR1" control" "unable to reload user session services"
+        [ $? -eq 0 ] && try_load_preserve_rc "send_signal -USR1 control" "unable to reload user session services"
+
+        # Check if we just loaded modules of correct version.
+        [ $? -eq 0 ] && try_load_preserve_rc "check_status_kernel" "kernel modules were not reloaded"
+
+        # Check if user-land processes were restarted as well.
+        [ $? -eq 0 ] && try_load_preserve_rc "check_status_user" "user-land services were not started"
 
         if [ $? -eq 0 ]; then
-
-            # Check if we just loaded modules of correct version.
-            check_status_kernel
-
-            # Check if user-land processes were restarted as well.
-            check_status_user
-
             # Take reported version of running Guest Additions from running vboxguest module (as a paranoia check).
             info "kernel modules and services $(running_module_version "vboxguest") reloaded"
@@ -1232 +1237 @@
 status-kernel)
     check_root
-    check_status_kernel && info "Kernel modules are loaded"
+    check_status_kernel
+    if [ $? -eq 0 ]; then
+        info "kernel modules are loaded"
+    else
+        info "kernel modules were not loaded"
+        false
+    fi
     ;;
 status-user)
@@ -1238 +1249 @@
     check_status_user
     if [ $? -eq 0 ]; then
-        info "User-land services are running"
+        info "user-land services are running"
     else
-        info "User-land services are not running"
+        info "user-land services are not running"
         false
     fi