[neon/forks/ubuntu-release-upgrader/Neon/release_noble] DistUpgrade: sync quirks file to lp/ubuntu/noble

[Jonathan Riddell]

Git commit 17392bbeac5473d33096e42879552e5e325930fe by Jonathan Riddell.
Committed on 09/09/2024 at 10:41.
Pushed by jriddell into branch 'Neon/release_noble'.

sync quirks file to lp/ubuntu/noble

M  +0    -41   DistUpgrade/DistUpgradeQuirks.py

https://invent.kde.org/neon/forks/ubuntu-release-upgrader/-/commit/17392bbeac5473d33096e42879552e5e325930fe

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 3f6afdc6f..bb34ecf23 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -31,7 +31,6 @@ import hashlib
 import subprocess
 import pathlib
 from subprocess import PIPE, Popen
-from shutil import copyfile
 
 from .utils import get_arch
 
@@ -132,7 +131,6 @@ class DistUpgradeQuirks(object):
 
         cache = self.controller.cache
         self._test_and_warn_if_ros_installed(cache)
-        self._fix_missing_nvidia_metapackage()
 
         self._maybe_prevent_flatpak_auto_removal()
 
@@ -167,7 +165,6 @@ class DistUpgradeQuirks(object):
         if 'linux-firmware-raspi2' in cache:
             if cache['linux-firmware-raspi2'].is_installed:
                 self._remove_uboot_on_rpi()
-                self._remove_netplan_match_rpi()
 
     # individual quirks handler when the dpkg run is finished ---------
     def PostCleanup(self):
@@ -395,44 +392,6 @@ class DistUpgradeQuirks(object):
                 self._view.error(summary, msg)
                 self.controller.abort()
 
-    def _test_and_fail_on_pam_tally(self):
-        """
-        Test and fail if pam_tally or pam_tally2 appears in the system's
-        PAM config for any service.  These modules have been dropped as
-        obsolete, so references to them in the config will break services
-        on upgrade.  The libpam-modules package has a preinst that will also
-        enforce this, but we want to enforce at the start of the upgrade
-        before we get halfway through an apt transaction.  LP: #1977493
-        """
-
-        for f in os.listdir('/etc/pam.d'):
-            if f in ('common-account', 'common-auth', 'common-password',
-                     'common-session', 'common-session-noninteractive'):
-                # managed by pam-auth-updates, and any references to
-                # pam_tally* will be handled by libpam-modules on upgrade
-                # without breaking
-                continue
-            with open(os.path.join('/etc/pam.d', f)) as f:
-                content = f.read()
-                if re.search('^[^#]*pam_tally', content, re.MULTILINE):
-                    logging.error("pam_tally* in use")
-                    # from libpam-modules.templates
-                    summary = _("You are using pam_tally or pam_tally2 in "
-                                "your configuration.")
-                    msg = _("The pam_tally and pam_tally2 modules have been "
-                            "removed from PAM. You are using one of these "
-                            "modules in your PAM configuration in /etc/pam.d. "
-                            "You must remove the uses of these modules before "
-                            "PAM can be upgraded; including these modules in "
-                            "your PAM configuration after the upgrade will "
-                            "stop users from being able to log into the "
-                            "system.") + "\n\n" + \
-                        _("Consider the pam_faillock module as a "
-                          "replacement for pam_tally.")
-                    self._view.error(summary, msg)
-                    self.controller.abort()
-                    return
-
     def _test_and_fail_on_power8(self):
         """
         Test and fail if running on a POWER8 processor. Starting with Ubuntu