From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 9 Feb 2023 16:16:47 +0000 (+0100)
Subject: Use shutil.move() to move /etc/resolv.conf symlink
X-Git-Tag: v15~338
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=816967ddeeaf7471bc56d681705c5bb18c9c0a23;p=thirdparty%2Fmkosi.git

Use shutil.move() to move /etc/resolv.conf symlink
---

diff --git a/mkosi/run.py b/mkosi/run.py
index 5ac230e36..200844336 100644
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -307,7 +307,7 @@ def run_workspace_command(
         # Bubblewrap does not mount over symlinks and /etc/resolv.conf might be a symlink. Deal with this by
         # temporarily moving the file somewhere else.
         if resolve.is_symlink():
-            shutil.copy2(resolve, state.workspace / "resolv.conf", follow_symlinks=False)
+            shutil.move(resolve, state.workspace / "resolv.conf")
 
         # If we're using the host network namespace, use the same resolver
         cmdline += ["--ro-bind", "/etc/resolv.conf", "/etc/resolv.conf"]
@@ -333,4 +333,4 @@ def run_workspace_command(
         die(f"\"{shlex.join(str(s) for s in cmd)}\" returned non-zero exit code {e.returncode}.")
     finally:
         if state.workspace.joinpath("resolv.conf").exists():
-            shutil.copy2(state.workspace.joinpath("resolv.conf"), resolve, follow_symlinks=False)
+            shutil.move(state.workspace.joinpath("resolv.conf"), resolve)