From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a17:902:c1d5:b029:d1:f2ab:cf6e with SMTP id c21-20020a170902c1d5b02900d1f2abcf6emr907088plc.67.1601446757729; Tue, 29 Sep 2020 23:19:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:3855:: with SMTP id f82ls417579pfa.10.gmail; Tue, 29 Sep 2020 23:19:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0msD/TqH1nAOYB4/ikmBlJUWKbp0aj7NXcm4ihY23Gsj0ow3XnL4pai6ajGGqRHVXSC6w X-Received: by 2002:a63:c00d:: with SMTP id h13mr997959pgg.358.1601446756944; Tue, 29 Sep 2020 23:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446756; cv=none; d=google.com; s=arc-20160816; b=M7rHc9f+pdSy3ociumb71T4fth/QqIw1+IiBYkZDuAHMv5c9ihUMSHbmDxyo+VVItx oMogPjCUl5nvgrxr8Hlhg+44T36G//YT/kAsoFzgchdBVP6eXvxo9K0/LCA11K7tU+Ng vkpbUK8gnd1y+/RW7IPxcDbrqewxk1RFUsdI/CIRYj0DHphVCqW4oxGjFjdMOMEsFrD4 3dSCDIJYnVYYRN7d0kTGU18IFICKYAwtuBZPPYsvAmK5b4GnUFMdMtOMNA66e5HjpTaW amPxtesT400HeDXT0Zgv7wiTDRmoziv5KRY0CBBaoEi1ixAgjbNrgJMDCvugmhNzSxa2 ZDdg== 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=ruGA2lxjpx0PjwK9JMWjhOPd4lpZG8pSZOfs9VyNLTN1vLBaU4FfgPeXL27eqew+8X 15IaSeKLGE1G8wJ/Qn6N1VLDDRtgtOYPerCj5hw/STzcDHws6omeRAwp11QDBtsgHlHD 5iDtkpiuVq+HYdKWPUj7DcQ7N2OuZbvj+mHN+eJjwC9lz11orl93TPB419WEWZQ3w//K dgjGD0+sbed7O8xkBYOvNwn6SuRNiiPUwrD5+vLselyu5Wdoz4kveDT1s2wEVfhfsNGD VV3jiaGzdBvadgNX4+nLH6evYUZcCUpASLwygxEgFWwvlusJSI/65C4Ac4Dw8rbdAaTa UbAw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 18si44564plg.4.2020.09.29.23.19.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:19:16 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: Ot/Bws/4jWsKsRFZwxJ+kosX90q0ea9/PiLgbPinMPVX0ORYXlnrnYfq2NdtkP6zuSoSd3ek0w S9JB4OlFuatdg5BQAwgNmEE79t436J4LoHuryng13lSqopcHA3cRJbGz08/YnLo4SobkCl23Sh qQc02wybmK0LjBwUUqV6QWMUrXN2Csj1pA/RWjPsvMLkuua+TQwZqq2NbM+p6+s7xKgaOM9p/3 amjul3xZ2T/B3LNDGAAioT0KmZA4LxenA8qJbg8xK0mbVO7CL02Y1evmeb5jcw+K7QBbr35J0i LUQ= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="55661546" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:19:15 -0800 IronPort-SDR: ATQBdds8dx5ei9l0ABMhAxCA01J/SMdf4kxnH+Hl6DGqPFfnEhu0h0Sae7tKVOtEiPX5j6V10f HAOvy4mMEvYgQwU1bhfvMmNgG0RBaZmXnN22k2UPDZkkHFDZOGB0KsVnYAR36hh0NUAERGDEyZ +cCDUcGbC+C1Wnnsa6vL9HxxzmKc+GClkkJZsITzQcrPZjH/2cVPq/A3jH3Z3Wps+ZT9gHkXaj 8QtgNxnpOwhcH/5XJnn4Mvd+9CsSz2Auz8rRPBjW4jRM4/ibQ6W1tbSVXvGrNh3PbzRVsB6Olh Bw4= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 12/13] rootfs: Fix possible overwrite of existing resolv.conf Date: Wed, 30 Sep 2020 11:48:32 +0530 Message-ID: <20200930061833.13347-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930061833.13347-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060707.12785-5-Vijaikumar_Kanagarajan@mentor.com> <20200930061833.13347-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: DRsle4CgjoVi 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