Merge ~schopin/ubuntu-release-upgrader:nvidia-quirk into ubuntu-release-upgrader:ubuntu/jammy

[Simon Chopin]

[Simon Chopin (schopin)]

This has been tested on proper hardware, worked as expected when upgrading from a fresh 22.04.3 install, while not doing anything when upgrading from Impish or from a server install.

[Julian Andres Klode (juliank)]

review: Needs Fixing

[Julian Andres Klode (juliank)]

Approving this as it should not cause terrible breakage at least even if something else called commit on the same cache, but this should be investigated further and resolved differently I suppose.

review: Approve

[Brian Murray (brian-murray)]

I see one typo, which I'm happy to fix, but there is a more serious question about what to do when the driver metapackage isn't available in the cache.

review: Needs Fixing

[Steve Langasek (vorlon)]

If the driver metapackage is not available in the cache, I think the preference should be to abort and tell the user to fix their sources - rather than proceeding with the upgrade and breaking their desktop setup.

That's also the more conservative option, because affected users will be held back and we can iterate further improvements on the upgrader as necessary - rather than them being upgraded and broken.

[Brian Murray (brian-murray)]

> If the driver metapackage is not available in the cache, I think the
> preference should be to abort and tell the user to fix their sources - rather
> than proceeding with the upgrade and breaking their desktop setup.
>
> That's also the more conservative option, because affected users will be held
> back and we can iterate further improvements on the upgrader as necessary -
> rather than them being upgraded and broken.

I've gone ahead and created a new merge proposal building on this but it exits if the driver metapackage is not available.

https://code.launchpad.net/~ubuntu-core-dev/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/427736

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index c6be753..f60e3c0 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -122,6 +122,7 @@ class DistUpgradeQuirks(object):
 
         cache = self.controller.cache
         self._test_and_warn_if_ros_installed(cache)
+        self._fix_missing_nvidia_metapackage()
 
         if 'snapd' not in cache:
             logging.debug("package required for Quirk not in cache")
@@ -1437,3 +1438,42 @@ class DistUpgradeQuirks(object):
                               "%s: %s; %s",
                               netplan_config_filename, exc, failure_action)
                 return
+
+    def _fix_missing_nvidia_metapackage(self):
+        # LP: #1955047
+        # Desktop installs for 20.04.3 on systems with nvidia graphics don't have the
+        # driver metapackage installed
+        logging.debug("running Quirks._test_and_fix_missing_nvidia_metapackage")
+        try:
+            from NvidiaDetector.nvidiadetector import NvidiaDetection
+        except (ImportError) as e:
+            logging.error("NvidiaDetection can not be imported %s" % e)
+            return
+        nv = NvidiaDetection()
+        versions = nv.drivers.keys()
+        cache = self.controller.cache
+        # Early exit if there's a driver metapackage installed
+        for version in versions:
+            desktop = 'nvidia-driver-{}'.format(version)
+            if desktop in cache and cache[desktop].is_installed:
+                logging.debug("package {} detected, exit.".format(desktop))
+                return;
+        version_to_fix = None
+        # If we find an autoremovable libnvidia-gl package, this probably means the user
+        # hit LP: #1955047
+        for version in versions:
+            nvidia_gl = 'libnvidia-gl-{}'.format(version)
+            if nvidia_gl in cache and cache[nvidia_gl].is_installed and cache[nvidia_gl].is_auto_removable:
+                version_to_fix = version
+                logging.debug("Found autoremovable package {}, assuming we're missing nvidia-driver-{}".format(nvidia_gl, version))
+                break
+        if version_to_fix is None:
+            logging.debug("No autoremovable libnvidia-gl found, exiting.")
+            return
+        missing_metapackage = "nvidia-driver-{}".format(version_to_fix)
+        if missing_metapackage not in cache:
+            logging.error("Package {} not available in the APT cache!".format(missing_metapackage))
+            return
+        logging.debug("Installing missing nvidia driver metapackage {}".format(missing_metapackage))
+        cache[missing_metapackage].mark_install()
+        cache.commit(None, None)
diff --git a/debian/changelog b/debian/changelog
index 9ca24a5..6f3ba43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubuntu-release-upgrader (1:22.04.13) UNRELEASED; urgency=medium
+
+  * quirk: fix nvidia driver autoremoval issue (LP: #1955047)
+
+ -- Simon Chopin <[e-mail]>  Tue, 02 Aug 2022 15:45:26 +0200
+
 ubuntu-release-upgrader (1:22.04.12) jammy; urgency=medium
 
   [ Brian Murray ]