From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 14 Apr 2023 10:09:25 +0000 (+0200)
Subject: opensuse: Remove pam workaround
X-Git-Tag: v15~256^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a373a53db6efa7d7f03e8ed973685a47cda81b3;p=thirdparty%2Fmkosi.git

opensuse: Remove pam workaround

Let's not muck around with distro defaults and leave this as
something to fix in opensuse itself.
---

diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index 054dd29b6..80cecea0b 100644
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -1,11 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
-import shutil
 from collections.abc import Sequence
 from pathlib import Path
 from textwrap import dedent
 
-from mkosi.backend import MkosiState, patch_file
+from mkosi.backend import MkosiState
 from mkosi.distributions import DistributionInstaller
 from mkosi.log import complete_step
 from mkosi.run import run, run_with_apivfs
@@ -168,20 +167,3 @@ def install_opensuse(state: MkosiState) -> None:
 
     zypper_install(state, ["filesystem", *state.config.packages])
     zypper_finalize_repositories(state)
-
-    if state.config.base_image is not None:
-        return
-
-    if state.config.password == "":
-        if not state.root.joinpath("etc/pam.d/common-auth").exists():
-            for prefix in ("lib", "etc"):
-                if state.root.joinpath(f"usr/{prefix}/pam.d/common-auth").exists():
-                    shutil.copy2(state.root / f"usr/{prefix}/pam.d/common-auth", state.root / "etc/pam.d/common-auth")
-                    break
-
-        def jj(line: str) -> str:
-            if "pam_unix.so" in line:
-                return f"{line.strip()} nullok"
-            return line
-
-        patch_file(state.root / "etc/pam.d/common-auth", jj)