From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Mon, 12 Jun 2023 13:59:24 +0000 (+0200)
Subject: debian: drop workarounds for EoL Debian versions
X-Git-Tag: v15~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e668a4055728c30b0723719d9da2e2f186ec33d;p=thirdparty%2Fmkosi.git

debian: drop workarounds for EoL Debian versions
---

diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index 5b606ed1d..a792da12a 100644
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -38,10 +38,7 @@ class DebianInstaller(DistributionInstaller):
         updates = f"deb {state.config.mirror} {state.config.release}-updates {repos}"
 
         # Security updates repos are never mirrored
-        if state.config.release in ("stretch", "buster"):
-            security = f"deb http://security.debian.org/debian-security {state.config.release}/updates {repos}"
-        else:
-            security = f"deb http://security.debian.org/debian-security {state.config.release}-security {repos}"
+        security = f"deb http://security.debian.org/debian-security {state.config.release}-security {repos}"
 
         return [main, updates, security]
 
@@ -99,12 +96,6 @@ class DebianInstaller(DistributionInstaller):
                 run(["dpkg-deb", "--fsys-tarfile", deb], stdout=f)
                 run(["tar", "-C", state.root, "--keep-directory-symlink", "--extract", "--file", f.name])
 
-        # There is a bug in Debian stretch where libuuid1 (which is essential) unecessarily depends on passwd,
-        # which breaks the installation as passwd is then configured before base-passwd
-
-        if state.config.release == "stretch":
-            cls.install_packages(state, ["base-passwd"])
-
         # Finally, run apt to properly install packages in the chroot without having to worry that maintainer
         # scripts won't find basic tools that they depend on.