From 279328cd3231b972cc32c241aa45e5df20b0e947 Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: Tue, 22 Feb 2022 11:55:16 +0100
Subject: [PATCH 2/2] Do not copy /etc/resolv.conf to chroot before
 installation

It does not seem to make sense anymore given systemd-resolved is
creating its own symlink in rpm postin script that rewrites the file.

(see rhbz#2018913, rhbz#2032085)
---
 pyanaconda/core/configuration/system.py |  5 -----
 pyanaconda/installation.py              | 25 -------------------------
 pyanaconda/network.py                   | 24 ++----------------------
 3 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/pyanaconda/core/configuration/system.py b/pyanaconda/core/configuration/system.py
index 85560280b9..9ff8b77ba4 100644
--- a/pyanaconda/core/configuration/system.py
+++ b/pyanaconda/core/configuration/system.py
@@ -171,8 +171,3 @@ class SystemSection(Section):
     def provides_system_bus(self):
         """Can we access the system DBus?"""
         return self._is_boot_iso or self._is_live_os or self._is_booted_os
-
-    @property
-    def provides_resolver_config(self):
-        """Can we copy /etc/resolv.conf to the target system?"""
-        return self._is_boot_iso
diff --git a/pyanaconda/installation.py b/pyanaconda/installation.py
index 95b63c1c8c..bcd201188f 100644
--- a/pyanaconda/installation.py
+++ b/pyanaconda/installation.py
@@ -45,25 +45,6 @@ log = get_module_logger(__name__)
 __all__ = ["run_installation"]
 
 
-class WriteResolvConfTask(Task):
-    """Custom task subclass for handling the resolv.conf copy task.
-
-    The main reason is to resolve the sysroot path right before the
-    copy operation, not at task & task queue creation time.
-
-    Secondary reason is to demonstrate how a lightweight Task subclass can be used.
-    """
-
-    def run_task(self):
-        """Resolve the sysroot path only right before doing the copy operation.
-
-        If we just added the sysroot path as an argument, it would be resolved when the
-        task queue was created, not when the task is actually executed, which could
-        theoretically result in an incorrect path.
-        """
-        network.copy_resolv_conf_to_root(conf.target.system_root)
-
-
 def _writeKS(ksdata):
     path = conf.target.system_root + "/root/anaconda-ks.cfg"
 
@@ -309,12 +290,6 @@ def _prepare_installation(payload, ksdata):
     # - check for possibly needed additional packages.
     pre_install = TaskQueue("Pre install tasks", N_("Running pre-installation tasks"))
 
-    # make name resolution work for rpm scripts in chroot
-    if conf.system.provides_resolver_config:
-        # we use a custom Task subclass as the sysroot path has to be resolved
-        # only when the task is actually started, not at task creation time
-        pre_install.append(WriteResolvConfTask("Copy resolv.conf to sysroot"))
-
     if is_module_available(SECURITY):
         security_proxy = SECURITY.get_proxy()
 
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index d5fd6e2add..38fe957104 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -16,10 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import shutil
 import socket
 import itertools
-import os
 import time
 import threading
 import re
@@ -31,7 +29,6 @@ from pyanaconda.anaconda_loggers import get_module_logger
 from pyanaconda.core import util, constants
 from pyanaconda.core.i18n import _
 from pyanaconda.core.kernel import kernel_arguments
-from pyanaconda.core.path import make_directories
 from pyanaconda.core.regexes import HOSTNAME_PATTERN_WITHOUT_ANCHORS, \
     IPV6_ADDRESS_IN_DRACUT_IP_OPTION, MAC_OCTET
 from pyanaconda.core.configuration.anaconda import conf
@@ -56,9 +53,8 @@ _nm_client = None
 
 __all__ = ["get_supported_devices", "status_message", "wait_for_connectivity",
            "wait_for_connecting_NM_thread", "wait_for_network_devices", "wait_for_connected_NM",
-           "initialize_network", "copy_resolv_conf_to_root", "prefix_to_netmask",
-           "netmask_to_prefix", "get_first_ip_address", "is_valid_hostname", "check_ip_address",
-           "get_nm_client", "write_configuration"]
+           "initialize_network", "prefix_to_netmask", "netmask_to_prefix", "get_first_ip_address",
+           "is_valid_hostname", "check_ip_address", "get_nm_client", "write_configuration"]
 
 
 def get_nm_client():
@@ -218,22 +214,6 @@ def iface_for_host_ip(host_ip):
     return route_info[route_info.index("dev") + 1]
 
 
-def copy_resolv_conf_to_root(root="/"):
-    """Copy resolv.conf to a system root."""
-    src = "/etc/resolv.conf"
-    dst = os.path.join(root, src.lstrip('/'))
-    if not os.path.isfile(src):
-        log.debug("%s does not exist", src)
-        return
-    if os.path.isfile(dst):
-        log.debug("%s already exists", dst)
-        return
-    dst_dir = os.path.dirname(dst)
-    if not os.path.isdir(dst_dir):
-        make_directories(dst_dir)
-    shutil.copyfile(src, dst)
-
-
 def run_network_initialization_task(task_path):
     """Run network initialization task and log the result."""
     task_proxy = NETWORK.get_proxy(task_path)
-- 
2.35.1