From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a5d:4f90:: with SMTP id d16mr4313395wru.292.1606311988575; Wed, 25 Nov 2020 05:46:28 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f70d:: with SMTP id r13ls2844154wrp.1.gmail; Wed, 25 Nov 2020 05:46:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzEE3kbKIFp8Ck6CxlRp4Br0tjk3gSz+/fiR5xTGSCG4JFoV2xXbSC2aVInr1oi6Ui/moyR X-Received: by 2002:adf:9e4d:: with SMTP id v13mr4115340wre.135.1606311987659; Wed, 25 Nov 2020 05:46:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311987; cv=none; d=google.com; s=arc-20160816; b=heG89UdUvVF+jpDKOkqjC3QxR3eXFgSgHznGrdjchSR7/QSgMplKZd4o5sjj3Wm8QM pZOEwtpFCZAqg8R1P2iEsYZ1ONEw5s88pCio3gkpIYuYtcQPu2KUABQsymmtWWbaI16N LL83c3g0pPdaHvvOKPglFQrGRqi8052AH0LioMkLvJsMIz49LcweC7YcTbeEYR9L+qYC C/x/n8itOayNv8poZliz7LJcMK4HHqFZTfk3sx7TQbWeG9D2z0/GI3OllSQba0KqtEqn C5l7pSd0aINzsqGA+50FBH+Y58LWNv1PrvIMy4YTF9OoXMDIrUEksFyOruBnuXb7m2kd bYDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=m56Ql/yoYpxgzaP8G+s9k7Tl2aypB9c8UmAgAfs7OO4=; b=GUsSK7RlSUciLhYpCQXivlUkBv0sKQflEk1W/KTzXbowbOm06eZOyw3qC/T1DLBpXu IRIwYOA9Fm/cOPo+T+BMwIXj98hEx1IaqSii5ZoVPKI5Qq1lGCIvwfVcybIJmKKyhHWv 50FuETYNunXa6ItxS/BfB4HGWKc7RePvxjSyytAeZiUzau9DYd4oB+9mSdi2QNMZLPX6 +jTzoFeK6POqHxAPnmHHcZ+7g2CkDazL/yLD1IYA0WwheDGTrFL7cH9PnqBe4scDH9EF P/YUxWgZMJ2DeGs9haS0iIXCTYbmJNvNg3f0fxRlZJcpziw+VRH9ARYEHM3IinchjR3e Txdg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id m5si64609wmc.0.2020.11.25.05.46.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:46:27 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: SAWOln2JuUldPckDx6xrLl3JHlAjJjSQcanvfsU7gkwvfIqhB5lLxORXUS27pEUgM4F0vWywBp nk48o7BkMdH0paoNp36umkVTQsTaYaiWwFRIXKX3Bd7RpK9eFEdbUIPVeBFmeF17WeY5YGDaDG qeEcNuZ/Q6hd1/lJVyNGtHMwPvcCh7cuCgm32VlZClgKuAHx0Bx6BfGF60Tfg9t8kmKjJCa/2Z WbblOHtGXoLZr5ypARj5xd/V8UQZIXRF3ZBlqAQeKTuUtezYZGXlvFhDvCcvttSxecFyZYPewz Y/I= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597805" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:46:26 -0800 IronPort-SDR: kh/JK3dD3ZL/ThJ32e1F8YuGZSdQWRB9t5XIqQoZpJgD5OE1NoL0w4a8XUhz9ortkXSn+7Xw7P F4mcdu81oWrX2sTM2pK0M2zrt1qw48RTr260EWrpD1bnsWtzgJb5Fgof+tlcj36NExhJ/orPLM bNmKDj4kgBhJEpr+LQZTnq/4nVYt3jWgG3syZ7gpyUKIRRyFgErPIioQKfOeyD6Z8s02468yrj gR5hG88ratWhP47G8JuKsvhLA30IVe26XdfdpzPEehLEfJfAjRePpAtUGyk5JpuKRYzxizvqk1 sSk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 12/14] rootfs: Fix possible overwrite of existing resolv.conf Date: Wed, 25 Nov 2020 19:15:56 +0530 Message-ID: <20201125134558.26246-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: Nob/vqBMKyPD There is a possiblilty that one of the packages installed in the rootfs provides /etc/resolv.conf and we might accidentally remove it. Fix it by taking a backup of any existing resolv conf files and restoring it later. This is needed since we could not effectively move caching before rootfs_install_clean_files since we need the latest dpkg log. Signed-off-by: Vijai Kumar K --- meta/classes/rootfs.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 0aa5502..ed43fb9 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -186,10 +186,18 @@ python do_rootfs_install() { addtask rootfs_install before do_rootfs_postprocess after do_unpack cache_deb_src() { + if [ -e "${ROOTFSDIR}"/etc/resolv.conf ]; then + sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar + fi rootfs_install_resolvconf + deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO} - rootfs_install_clean_files + + sudo rm -f "${ROOTFSDIR}"/etc/resolv.conf + if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then + sudo mv "${ROOTFSDIR}"/etc/resolv.conf.isar "${ROOTFSDIR}"/etc/resolv.conf + fi } ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'clean-package-cache', 'rootfs_postprocess_clean_package_cache', '', d)}" -- 2.17.1