Merge ubiquity:xnox/fix-nvidia-oem into ubiquity:master

[Dimitri John Ledkov]

check-kernels: install the right nvidia modules for the OEM kernel.

LP: #1873867

check-kernels: install the right nvidia modules for the OEM kernel.

LP: #1873867

diff --git a/scripts/check-kernels b/scripts/check-kernels
index 34c2dae..a2e15a9 100755
--- a/scripts/check-kernels
+++ b/scripts/check-kernels
@@ -132,12 +132,27 @@ wants_oem_kernel() {
     fi
     return 1
 }
+wants_nvidia() {
+    test -e /run/ubuntu-drivers.autoinstall || return
+    for pkg in $(cat /run/ubuntu-drivers.autoinstall); do
+        case $pkg in
+            nvidia-driver-*)
+                echo $pkg | sed 's/nvidia-driver-/nvidia-/'
+                break
+            ;;
+        esac
+    done
+}
+nvidia_stem="$(wants_nvidia)"
 
 if wants_oem_kernel; then
     if [ -n "$compatible" ]; then
         incompatible="${incompatible:+$incompatible }$compatible"
         compatible=""
     fi
+    if [ "$nvidia_stem" ]; then
+        OEM_KERNEL="${OEM_KERNEL} linux-modules-${nvidia_stem}-${OEM_KERNEL#linux-}"
+    fi
     install_new="${install_new:+$install_new }${OEM_KERNEL}"
 fi
 
@@ -149,6 +164,9 @@ kernel_image_to_meta () {
 }
 kernel_image_to_modules () {
     echo "$1" | sed -n 's/^linux-image-/linux-modules-/p' | xargs dpkg-query -W -f'${Package}\n' 2>/dev/null
+    if [ "$nvidia_stem" ]; then
+        echo "$1" | sed -n "s/^linux-image-/linux-modules-${nvidia_stem}-/p" | xargs dpkg-query -W -f'${Package}\n' 2>/dev/null
+    fi
 }
 
 if [ -z "$compatible" ] && [ -z "$install_new" ]; then