Changeset 99510 in vbox for trunk/src/VBox/Additions/linux/installer

Timestamp:

Apr 21, 2023 5:29:06 PM (22 months ago)

Author:

vboxsync

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

157007

Message:

Additions: Linux: rcvboxadd: Check for root user on those actions which require root privileges, bugref:10359.

This prevents unexpected messages in stdout when script does not have permissions to write log files in /var.

File:

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

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

@@ -108 +108 @@
 }
 
+# When script is running as non-root, it does not have access to log
+# files in /var. In this case, lets print error message to stdout and
+# exit with bad status.
+early_fail()
+{
+    echo "$1" >&2
+    exit 1
+}
+
 fail()
 {
@@ -215 +224 @@
         cat "$version_string_path"
     else
-        echo "UNKNOWN"
+        echo "unknown"
     fi
 }
@@ -944 +953 @@
 }
 
+check_root()
+{
+    # Check if script is running with root privileges and exit if it does not.
+    [ `id -u` -eq 0 ] || early_fail "root privileges are required"
+}
+
 # Check if process with this PID is running.
 check_pid()
@@ -1048 +1063 @@
 {
     begin "reloading kernel modules and services"
-
-    # Check if script was started with root privileges.
-    [ `id -u` -eq 0 ] || fail "root privileges are required"
 
     # Stop VBoxService if running.
@@ -1146 +1158 @@
 # system so that we can see later if any were added.
 start)
+    check_root
     start
     ;;
@@ -1152 +1165 @@
 # this fast enough at start time if we discover we do not want to use them.
 stop)
+    check_root
     stop
     ;;
 restart)
+    check_root
     restart
     ;;
 # Tries to reload kernel modules and restart user processes.
 reload)
+    check_root
     reload
     ;;
@@ -1165 +1181 @@
 # current kernel.
 setup)
+    check_root
     cleanup && start
     ;;
 # Builds kernel modules for the specified kernels if they are not already built.
 quicksetup)
+    check_root
     if test x"$2" = xall; then
        for topi in /lib/modules/*; do
@@ -1184 +1202 @@
 # including all kernel modules.
 cleanup)
+    check_root
     cleanup
     ;;
@@ -1190 +1209 @@
     ;;
 status-kernel)
+    check_root
     check_status_kernel && info "Kernel modules are loaded"
     ;;
 status-user)
+    check_root
     check_status_user
     if [ $? -eq 0 ]; then