From patchwork Tue Nov 24 22:05:33 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: 201 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp152176oou; Wed, 25 Nov 2020 00:06:08 -0800 (PST) X-Received: by 2002:a19:910b:: with SMTP id t11mr816164lfd.306.1606291568665; Wed, 25 Nov 2020 00:06:08 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606291568; cv=pass; d=google.com; s=arc-20160816; b=f5EZHeyehq/CBSIMPgSVqZESOgAGOuapz2QZ1yINFcpjc9KAGAhBfNw8KAzTQnhfCB 9V/Q1Jeu9xkTSQjzHAL18uzAfO8DLpyJH9Ed01LceHpseNYI3tf/jEbC/c4W//Bc4w/r DROaxHoVHsZwjCbBAva2GjRqqZZy7fbuKAR/3euZnsRSxy7pCyAcjxDj2nNDUiM25u0Z Kodv/Hg7LEixeONnR40iGtORJI+2wkc+3CFdbt8f+hAZO0rLNg1G1f5HFlaG+BDr9FJ+ kSlz3Pb4YkrF5uZC/yY9AqTeCvxgKGEOOYJ/ASoQg5zEwHgXjAWqff4TQNrke9SxPPgu EOFw== 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=sEGFAxsZAu9e5jVm7rkHYMOoHFRyDAby5tUiQqUxg6w=; b=I44aRSVZ3gEXXpdOgucIME/rYNBSpFeFmyc1q2VDSbYxM0pI2e8LG2B/RzvhHg4pVI wISh+YDZ9y414WpeTJdyPdEmfgNSaNb1vlAyXJNCXFmdTC41StpYIrnPya7tsu/0fx34 M6aJv7NDR7SKmTwmElksBgeu/tPfahyq/a7cQEKBHd8u7jUAIrNZJoL/ZTM01f9jCywH azxXpY088kEAmEv8/xuRRbYMHJrqU3477dJOQ6RtdIFR4nxg/RORJ43CGyuFpI+WMa9n KMNLynnOp68Fq0DP8tj9pVdXNYnn4goIGqMqfmV6+sbdvDm3MleVYX0qlMmIeyrwnOF0 GLyg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=qwXvn8bV; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4fa7d6qkgqefjf3pmq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB4FA7D6QKGQEFJF3PMQ@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 e22sor68265lfq.134.2020.11.25.00.06.08 (Google Transport Security); Wed, 25 Nov 2020 00:06:08 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4fa7d6qkgqefjf3pmq@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=qwXvn8bV; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4fa7d6qkgqefjf3pmq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB4FA7D6QKGQEFJF3PMQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606291568; cv=pass; d=google.com; s=arc-20160816; b=hYcN7WjAKdP2k5lsQsPwBcTnT8GC8eneSCioXQ7YVHN1Niswns5nWaUbW90hDf5DFD y7HKn2atRFHkus1tRuaAEvFO/UjcHcDrUHwXFwXBcrffOr4JqFnu6fWhUxIRD+rg2Xsc dhHgy7nDKl818vYh+djCl3lF/ZVX+tIjOCntN6vKtMvFYqOGn1s3xPLm37Dg6qx7fZZj dChtbWDO5fA4hSCDIll5ucyID0cOtUKUhP09W8weatakNCQTbtnKDSWv2IXk4z91ClVt n9UEejboFyVOYRf0ZKrHcbPp5r3L7svGG6ouI3QN73EZmbKEI9K9XM6o66kYqMNi23gm kjEw== 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=sEGFAxsZAu9e5jVm7rkHYMOoHFRyDAby5tUiQqUxg6w=; b=FcRxK48GoLWBakDNBxGOF0urPhbgf8/Zd6ZkhuYYvUjazztOWZY4qHbxRW7dnIKBt3 hel/hnKVVOOuw+F38EILeMank0gfC+OjP0gmoXejyH668aJh2sUQuVqZ8/cGEIbF1+8p Vkna/lSmtwd3RmmUszPFIKRMBNRs475zSTPs98rrgqiF2XlsRWwRFq/HPT4aA5r6PwPz Kx8konM0/YB6vZJqe2EF2/j8W/WOF1JtqFN6FFGmOcoUCYEiiaYJzVVDv8EIt+AJec3/ 6oc/mzYJvVaCe85fT9uHnRuHv+PrkcUBE0K3sqdt5LiJEfTVVpdBWys6nPkbKkMTfXDM eucQ== ARC-Authentication-Results: i=2; 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 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=sEGFAxsZAu9e5jVm7rkHYMOoHFRyDAby5tUiQqUxg6w=; b=qwXvn8bVoMoBSTlzk1iXxBOAZ1rxCUmOSdBR9Eq6w9ASx2TeN8kOLmPWW50A2L5JP2 OxyHjZqQVSBr+zF+v9beq/FKa/+cNZKjHBm2eunLWKcXjdZfBnJ1stf9bUHJ2EJSiC5s 023M6xJM4G9Q7Rhd2ynFMOHHf0j7F/mg5A7AeoOvxLocHFuu3d8SGFadvxe3wClGxIfP 9Ch20lNebiXMC45AzRGRoz9Chk8JvDfQHcahXs1fE72KFdqj09zqFzAgugW6mk4m+SHi LAHJv3H67x6sq9CAlXWhpXypIsjpiGQeScjMOOjx8uINuzH9AUtZc9oQ7oH+yLH0kBk+ Pmmg== 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=sEGFAxsZAu9e5jVm7rkHYMOoHFRyDAby5tUiQqUxg6w=; b=ap57DR0EFUD4t5SFCi/Q7hKHmXn54uDYsAKlqBS5S2YzMabyziZujx9sv/Zzmx6GJ/ EqsyDPArN01Z7dNvUhP1YfSUHZpxZTflTCLVEjhSFQS/Br+Y6AKspIi8U1d/pwrsy2Kj 63HP8VG++9n8NmkiIHRxTYhtiWoOWKkYbN0btSx/sfZVTaMOMkwlOg7N/SvK97G0QW8h eaRhILfeO/Dzk+83yR7Yimeby5yvjBzN8QLdV7yamhgqDmIQVg2UG9zA6BUAEgV1vdR6 vLAmhAV6m1wV/c60aEkahtn50qGzzVeEfUZ4GaNeOJI6gMxJbztqg5hjVT8aA9l61jos iBVg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532x5CU+V7oyIE5q7I9km3UpXsCQmIYc7zdqPdjiMC0SX7/c9ExG BXdosm6t6K+jjGOE7MuFhTA= X-Google-Smtp-Source: ABdhPJwBw+ktsIL1fBr9OL4VKwQrxERJXfgAoBp8jxi7JiEULBnP2WR30vTJtEjGaS3d4ogq1f3W/g== X-Received: by 2002:a19:505:: with SMTP id 5mr826198lff.578.1606291568333; Wed, 25 Nov 2020 00:06:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:d0e:: with SMTP id 14ls872783lfn.0.gmail; Wed, 25 Nov 2020 00:06:07 -0800 (PST) X-Received: by 2002:a19:bec6:: with SMTP id o189mr935098lff.179.1606291567243; Wed, 25 Nov 2020 00:06:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606291567; cv=none; d=google.com; s=arc-20160816; b=URn1ddMHUMoe2QpMWiCVNZsxC46EAeyyNUQGDRj4MDM5LTw5Dk0GmKp1LWdxBgf/os IP8oen0JcwSMQBSN6ev7TVP156qnTbyf089iLjQaNZkLeK3CbPugF7PyL9qjWV/B9Fhg rPTCjTU7FlwO0gCVwYHdEJLmvYtemmEn3vT1zAVbWGFSNW7hiYM4zKS0HuCJkw1WxE80 JY88oTij+/ew4/aqze3o8hu5/7xnGPig8rZLNPLCFf741rci5A6VfGp1Xw6TnvLvH6FK ftjYXSKuDqN7kUfm6ODXPa+0Z/RZfF5zEYoeq8RUEXM9Lt+HXeJfANd3a8xN6IS39cbJ yyaQ== 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=QhnjKAz/+Q5kO77myA5t2EPxGYVNhdW+TO9+6lpCrpj9aHPL2Q6vUGhr41mVJCUeMS +AwgT2UTHYGKcCynV6AMMakQ3yGzH+sxlhQQpnt/ijANFnWfOchOXQzity7eVkAmGxgB 5wH83ow0vMCfwAPIcSMnNcMfgk8PUhvDW5CG7scqrC6/llS3/DC2qefJaJGNM8eLGqOg 2QPArboAfeW4dSoz8xP0GSpKoeBPRuRXC5GkDKQyGHdVnPipigiiDPflUfZZCgnzJpEo E63r8SXCAN9eyLwgMPGHvzx5zXvcwFieZY51xnE2/e6XkieL5f3qBUPGhZv7OG2bNi1K O0fg== 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 Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id f5si63813ljc.0.2020.11.25.00.06.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 00:06:07 -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; IronPort-SDR: ttvIm9dF88JIjQa0e379DxzpqDH+l1IlDFeXe46V7OuZy06qqAJs57C66aZ0ePjjOFj4jbbgFP b+hbwv7dCthT1dABfRCjoDKpfqdNoIEwseNwWyz8JhYJeWCa9YB6tqtL4lecVaIwEX4sws8+fa BMxPGw6k0SJnvF4jV8BgE7tcVtebRaSGAEpdybSKKmZgENKrztaXotYDdn8rFNYc8mP57efEvI GXqIZnJb4M/7qkcLa+W7kMT6+Cp/MVlMup7wfptyeJ03AEeinGC/qypeqWv1bQXaybHfHPG+ld 1Ac= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55587688" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 00:06:06 -0800 IronPort-SDR: jmfVNrgwM2aFb5es6I4xk1oHSrjoNOATfbIX9Kp6NgJClE01SgB9ErQ46E3Dg7Uz9vVDDz5lsG XNiq8JMg9+xT7dJJ1D2y8j+Exbv2h+Hh62duiT2gjjtxeCYpSup0L3tnzHMOIC8ZDiynhuKPA4 DwgriglQLx3EYyghZXeSpleiKltFRBB2Ou0fyQoRpptsq3gdAhjDXOnIYAqjQhGBCRdo5CM91g ZrXrqW06z0UsWe79ffD0HfkRycHH8GTYB/cT+OIJYNXUSQjvM2kEPlQaQHk3nzVshCBhCUyByc E9Q= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v7 12/14] rootfs: Fix possible overwrite of existing resolv.conf Date: Wed, 25 Nov 2020 13:35:33 +0530 Message-ID: <20201125080535.16223-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125080535.16223-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125080301.15818-9-Vijaikumar_Kanagarajan@mentor.com> <20201125080535.16223-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) 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.137.252 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?1684318788413988876?= X-GMAIL-MSGID: =?utf-8?q?1684318788413988876?= 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)}"