From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899390751905415168 X-Received: by 2002:a37:66d4:: with SMTP id a203mr2602442qkc.362.1606389701744; Thu, 26 Nov 2020 03:21:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aed:36ea:: with SMTP id f97ls730783qtb.4.gmail; Thu, 26 Nov 2020 03:21:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJw6uL8ROC4PS6oQnbbwFdLakXFd9NWYpbvMgqwGIwaFxcoDFX9qusb9nUorzXc4O30Z7jWP X-Received: by 2002:aed:2662:: with SMTP id z89mr2605799qtc.70.1606389701364; Thu, 26 Nov 2020 03:21:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606389701; cv=none; d=google.com; s=arc-20160816; b=QIGWgDJAOmZR++tii56rv+Xnnm/kS5ON9M4L882xlaOKd/+oFgSA3C8dO4O4PJ1NAP rNk7DdCk34mCaHVwPKvHX0ZWGPG1CEsmGemTgXw6KqvM/x9yBi3EmSEexpZ/JcrRJmZP o+VH/oo8OpF9ZQJ7SVRqQ/7P5R6mSyU+vULbDxdBqnASHl+Gs72RQBDsnRtQYE2rTj9/ tBUIwpM5ozFYl5U6VFkH/oNDcXQSg9nEl/Z9BxNowTnc15240DKAKaa4trYUvstq4EGc rAt8y3NJEDI8PBYlbV7te5S5h/RtvGmhokToxEknZ656hJMFtWqVdf3oguMaI1PovXi/ PYnw== 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=aigCLrg9iddFMMpm7Qz6QMYhogKgRCOxCZ4c/9IUab0=; b=R/I6lONhKXkupQnJIqJFVHrS2/oX/SMOyGsKp3ox1exOXBusBUl8kB2KEI2rblYkgm YXfHFVJmGPmlorCPIzC2i6L+Ye668cA4z8mpsx3jC8RZH2Bf130zRlmfQny12gFVC/Wj RCkOKWmXdwhXUUWZC19F28wbLu9ffOJ9GDLRF906Bs29DgHXMsvmSbFC3COU1SS9uP+D yMZ0Sy7f8jb9KMzyj5D0Rdg2nVXjt49f38+rG4w852eRRFf47WnNgZ/ykfBLJfxupD2j K9bQK8Yy0jkEC9eW6HAcSd4DImyEgPRlJio/vhKOkMmHjoDCiIDiCb75WRjNBvoZoDne lXVQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id f21si113872qtx.5.2020.11.26.03.21.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 03:21:41 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: pCV4cARRzrr+FwRYuOUZeZS0aHk77P42ZgCEH6i8V7oneVzitTyWSDneMc3YluaNDIo4/sBmzt gWmO/EgbC/A7IO8eRT3sNfvFbFZheNyca26kO6wFRgzA/l9SdYWl6bJV9bzGJ6YWbZXNRaqxcl Aqsqm5YpyKIY4dzC2Fec2+/GA3Es741M3p2rohaAIXZJ4axJCH1h0r5N9o4rotKPSl6g+8YoWz C2ZDto4bgW06SzdNGzH+Cc6tOio43CgRLVYRC/j+YlFfE76PVktvgkH2ZLDGMMT98McM8cQPMa JV0= X-IronPort-AV: E=Sophos;i="5.78,371,1599552000"; d="scan'208";a="55523589" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 26 Nov 2020 03:21:40 -0800 IronPort-SDR: g0Xs4JP2fTGLytFcncCQ96e13nQSiXNh4QVX1s/aPJtQXU0ZxVnY+lu+z6ywOgZ8yq776IAK7A K0Mx4ur7OhfjcBAfeTraNAsuB254cA1XwXH6n6bPdrsdK+SJ9BFEG1+EDdFZuG0qy4o2FkJ5r2 VFAR9QFAMMWDhVnmndTJKkVnbbV9tUVU4S5RPNnWanGs5bt7v2N/fN54JTr2DKaIphz/eP4Vw4 XbDqwTK58Lxp5vUz8zGnMV3BYCgvSAWdiCZvIr73GJFgQHfEuaOdJZe8IjTjqlylDB3H/xhiA4 mqw= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v9 12/14] rootfs: Fix possible overwrite of existing resolv.conf Date: Thu, 26 Nov 2020 16:51:06 +0530 Message-ID: <20201126112108.3320-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126112108.3320-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126111912.3037-9-Vijaikumar_Kanagarajan@mentor.com> <20201126112108.3320-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: P8AC2+JpwLYe 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 9142f12..b6dc2c8 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -185,10 +185,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