Merge ~enr0n/ubuntu-release-upgrader:lp-2061891 into ubuntu-release-upgrader:ubuntu/main

[Nick Rosbrook]

Add a quirk for this issue instead of using KeepInstalledPkgs, which is incomplete.

[Julian Andres Klode (juliank)]

lgtm

review: Approve

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index c8f3576..d5c2662 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -185,6 +185,7 @@ class DistUpgradeQuirks(object):
         # self._install_python_is_python2()
         self._maybe_remove_gpg_wks_server()
         self._install_t64_replacement_packages()
+        self._handle_ufw_breaks()
 
     # individual quirks handler that run *after* the dist-upgrade was
     # calculated in the cache
@@ -1795,3 +1796,39 @@ class DistUpgradeQuirks(object):
                 logging.debug(
                     f'Failed to find a replacement for {package.name}'
                 )
+
+    def _handle_ufw_breaks(self):
+        """
+        LP: #2061891
+        """
+
+        # This is only required for upgrades from jammy.
+        if self.controller.fromDist != 'jammy':
+            return
+
+        try:
+            ufw = self.controller.cache['ufw']
+        except KeyError:
+            return
+
+        if not ufw.is_installed:
+            return
+
+        remove_ufw = False
+        for name in ('netfilter-persistent', 'iptables-persistent'):
+            try:
+                pkg = self.controller.cache[name]
+            except KeyError:
+                continue
+
+            if pkg.is_installed:
+                logging.info(
+                    f'Keeping {name}, and removing ufw as a result.'
+                )
+
+                pkg.mark_install(auto_fix=False, auto_inst=False)
+                remove_ufw = True
+
+        if remove_ufw:
+            ufw.mark_delete(auto_fix=False)
+            apt.ProblemResolver(self.controller.cache).protect(ufw)
diff --git a/data/DistUpgrade.cfg.jammy b/data/DistUpgrade.cfg.jammy
index fcc436b..ce3e994 100644
--- a/data/DistUpgrade.cfg.jammy
+++ b/data/DistUpgrade.cfg.jammy
@@ -23,7 +23,7 @@ Demotions=demoted.cfg
 #RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
 RemovalDenylistFile=removal_denylist.cfg
 # if those packages were installed, make sure to keep them installed
-KeepInstalledPkgs=xserver-xorg-video-all,netfilter-persistent,iptables-persistent
+KeepInstalledPkgs=xserver-xorg-video-all
 KeepInstalledSection=translations
 RemoveObsoletes=yes
 PurgeObsoletes=yes