From patchwork Thu Nov 26 01:21:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 235 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp1230642oou; Thu, 26 Nov 2020 03:21:42 -0800 (PST) X-Received: by 2002:a37:5f42:: with SMTP id t63mr2586925qkb.236.1606389702003; Thu, 26 Nov 2020 03:21:42 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606389701; cv=pass; d=google.com; s=arc-20160816; b=hd/fnH+tKJyl49LJf+EwqJum8b7RxCjlOq7MQG081GoeUPboq7jZ66SeouaExJxUTy YgCZQbjLoU4UvrzeLYCanyPriDCE5idNxlS/Bt50Z2Px1h8sIQFbliwzEcGDKE4/jOIa hUVNmmiTE/aJgbz6KKMEJl8s8M7GdNDr2DHyNZvHCsRrvgs92ZZv3pSjPT7hQTc5R1zI d3YX/9YbEu4nY0+J5ms3dRuFfYZU2jFK/gI5ebI1eBT2rqt4iKsf33bMlLPzSilot056 zYO2J7myMpmUffYBmTgkGpQ/NAAN0EvxmyxKZ2LayrSuBrHPretXfKX/UDpYDytd0XKC Uj2Q== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=4I3C3cUF20o40bsiiBETn9CI4lbsiz6vB8iAkGmVZUY=; b=pWX2T2x7neO8dAiDl7NL4hzrEyVESwXgOcQmViRWjmUOnL4H21Db98cpVFH5pA4UY6 wxF8P6yy4H2KV7dVDFMkPxM88TBhtWztXU5ovU1RBSD/ES9Fpoo74utfK/WyZm4Xtsrp oDaFuUjIuugdHvAK1JuVx6lqUsR/2b+bqa04qeV03oDHp1jXd8oKgIcZxhWZzHtacl1B vCKpqqFDmSf48K+c+2e3ZS0ALfBojItK0EcpWPcuBkfFWJ0sMsDHgFa2JjyX/3GfEw7C x3GTdmlyLkoU1NGcWXlH7ANQtsdy27WQnwDFUVYJp+eHdNLzJ1dVp1vem6oZ3rPUZkN0 z14Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=ZvOZ9XLt; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbrm7736qkgqeuzouhdy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBRM7736QKGQEUZOUHDY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id s4sor2975608qvq.39.2020.11.26.03.21.41 (Google Transport Security); Thu, 26 Nov 2020 03:21:41 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbrm7736qkgqeuzouhdy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=ZvOZ9XLt; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbrm7736qkgqeuzouhdy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBRM7736QKGQEUZOUHDY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606389701; cv=pass; d=google.com; s=arc-20160816; b=DnRvZdjzSFjbsvpsHMDpt/nI3iiXY38tNFs0bhmOxZ9cT6QRfSscvY5QamYR+dnjuc W2hQDcfpbHSH7wVpmoxCWG5nC05Ebj1KcKh7fuimYlfR6C7YN3LljRVtJtTTEQk1dh00 8F8uNi5Onn9vH8QMqFvY2HJGqJ7f+GSKhkvFvEKZLO0D0FsLUKcQdnHlaoZ9UCLLnbgC cobBHb/zHlxhjWjnxn+X7bBhVDUe1WxXm2RB0r5J/hyH94oDozNX3zobcvfG/LE0oI6w gyCy3PsQSOKtDKxU7UQtivCeSxNWWozhJWPDw2aCdsj3D2Tw3V0CzEHupDE82u4NimPq rWmw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=4I3C3cUF20o40bsiiBETn9CI4lbsiz6vB8iAkGmVZUY=; b=bvpqiIoOXftgbFAtxlmwgS1VSGQFWW58ADbKIw+1HchTtfccWSaj6IXj4XknLK1L8I llj5BzDMGKPAp5fPZ+TbC7C9utCzf9rzfNYrNQbFadFx7dWgZ3ZZWlRqas8kyXXvChGx m4qePx0LUt8h/GdNmOmKOxaaM1GH6T3M0gwXs0FUDbaWXOwm+XHnyr80cuC69pYdhOOw naak8TA7thOmlxujaaisU/5OCBWeRh7LZWVK88AFiuQXivrHcePd492iXGPaAAyc1g8d brSQ8cEEaPlW5n0QfNKBBeAzMhcGGzNWMtQ15JG9vj7oB8AesqXDJNRvHqe8c/YMgXXF 37KA== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=4I3C3cUF20o40bsiiBETn9CI4lbsiz6vB8iAkGmVZUY=; b=ZvOZ9XLtRVWHpSztoGz4cnaA/Nvuer9mmdTF4jiSN6PAu/YzYIJAJ7/RpWBjl/DFkM umWV80tBexAtR6aTeOL7S8uYZd4XntYduDdaHNNUQjwhGs+ANaLSXYUUE7tyA6cW75jH ZwtQRr/ThylV9mIlmSsvRHAQq01DzhuSAjOGEIc1VzxD1LplkofWNXPZ7b8zAqUSQIOd SLoNCahmQx10rNew0f+xlSvLjNnj24ohn0NmymlgqLJmThPZ5SQd8CTdAL8326S+JxbW k+OreKMRy/CmlLluvZ2e/nryMSs+8VUAv15W53+x10tt4UT8ROjfpUQL1KxsbYtsBEMk CLYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=4I3C3cUF20o40bsiiBETn9CI4lbsiz6vB8iAkGmVZUY=; b=LoLsIg9Qv06o3PYxgyzRpw94jfp7CZOetscvbdazZqTrgGxkQ98sHK02RSGmxbSNxe JDcbEPHdrE+AftoIRRNPRFyp9iDrvWWAJL9MCjv8lX1zVaYfS0EiJKcAW+Gx+3PKVDLZ xTDoT74I1ybCmnj8rg+5vbNeOjakN63jTkw71H2Qp/KDAhgW8oU/4fg2lQlSRnrxo0IV X7oPsxbOVBNGCYPpEJUy/OuS4vBvlhIQLEc0iL5+bPSeAukt51/rWFEWNZQbf9Cp3HeB 8Nuhe7b7nNdd2R3mzmK/0E4M4Da7yxFh/lh5g5H6yriEu6vEEbrCccsmupn7WiIzergk 31rw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5334fEG8vIrv1XgMZ+kQs0BLt2Jk4jjjEmSYZeKD33K/yUXV6wCK 7GQAfm35FTKaQzbZxZsSaCw= X-Google-Smtp-Source: ABdhPJwDTTzWyrAZ3Qco0zRmdlJ0XnNsOlj7g9nKfhj//GXAEqSVNCKoGqzMjxJ0aUEXF3Zr+agRPA== X-Received: by 2002:ad4:4d84:: with SMTP id cv4mr2599537qvb.14.1606389701691; 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-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 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; 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 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-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684421688096136919?= X-GMAIL-MSGID: =?utf-8?q?1684421688096136919?= 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)}"