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

Timestamp:

Oct 5, 2022 6:23:04 PM (2 years ago)

Author:

vboxsync

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

153943

Message:

Additions: Linux: rcvboxadd.sh: Fix the way module signing tool is discovered in the system, bugref:10287.

File:

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

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

@@ -305 +305 @@
 esac
 
-# Try to find a tool for modules signing.
-SIGN_TOOL=$(which kmodsign 2>/dev/null)
-# Attempt to use in-kernel signing tool if kmodsign not found.
-if test -z "$SIGN_TOOL"; then
-    if test -x "/lib/modules/$KERN_VER/build/scripts/sign-file"; then
-        SIGN_TOOL="/lib/modules/$KERN_VER/build/scripts/sign-file"
-    fi
-fi
 
 if type update-secureboot-policy >/dev/null 2>&1; then
@@ -383 +375 @@
         fi
 
-        # Check if signing tool is available.
-        [ -n "$SIGN_TOOL" ] || fail "Unable to find signing tool"
-
         # Get kernel signature hash algorithm from kernel config and validate it.
         sig_hashalgo=$(kernel_module_sig_hash)
@@ -393 +382 @@
         # Sign modules.
         for i in $MODULE_LIST; do
+
+            # Try to find a tool for modules signing.
+            SIGN_TOOL=$(which kmodsign 2>/dev/null)
+            # Attempt to use in-kernel signing tool if kmodsign not found.
+            if test -z "$SIGN_TOOL"; then
+                if test -x "/lib/modules/$KERN_VER/build/scripts/sign-file"; then
+                    SIGN_TOOL="/lib/modules/$KERN_VER/build/scripts/sign-file"
+                fi
+            fi
+
+            # Check if signing tool is available.
+            [ -n "$SIGN_TOOL" ] || fail "Unable to find signing tool"
+
             "$SIGN_TOOL" "$sig_hashalgo" "$DEB_PRIV_KEY" "$DEB_PUB_KEY" \
                 /lib/modules/"$KERN_VER"/misc/"$i".ko || fail "Unable to sign $i.ko"