From patchwork Tue Sep 29 22:18:32 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: 102 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4814983ooj; Tue, 29 Sep 2020 23:19:18 -0700 (PDT) X-Received: by 2002:a63:fc63:: with SMTP id r35mr974770pgk.156.1601446758027; Tue, 29 Sep 2020 23:19:18 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446758; cv=pass; d=google.com; s=arc-20160816; b=njI+EVH5V3gbtwzlQ7JWXQHN8R20cXiLqftKRLOaVrZp8LrJu3OqPXS8nfXCx/UQs6 xYt1CTkGJrULIt/85qXhmLdWEHJ56ucQwmjVXR32v7aLqwVB17n8o+LfLqhQEZB0znla J6q2hDQaV84i6TcAEga3id8iGe9r8QOrNxR26NopLCKanBPrbYKT63NF4HzSqsAzUwrg EXPVjyeFbgnki2v4oXZSUT7JvyluX3/3l0oPyzYMCMM56uXy5Nh9lgPfKO7UcB9E3IKf 1iZM7zSx/Q/lxQwkIXrCEmSto5Fcz+ySIuu9simPdjb5JmLmH/rjnQ03v2zB7wRio8H6 vukQ== 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=meN8Vjuwuuq3EVcBsbT/7rnCVnr9nCwlQpPoTDHEGIU=; b=AiWhr/qfUYBvxkvgYHtGuEXgpcYJN1y4I+P/mcYdIbxWchnmqupdTKq7JlMWph7T7v kUvvFMXQcZY6Hyndp3Cclk7ZGIkEbfcVHeF/6DRWXchdZ05AveSkRs/qLxTsCWERD/23 hR4RSA2Ct3ZfQftbnXJS4TjKhwF7yykLIydut4LsYFB/rs6g0vipyabYpkx4243wFNhn lgBCqcfQVMt7JDyCtUNWzIokdWVTdvdzuOu4vRwIWR8G8igrt+j11Qrw84AHM0xg0MuU zApbrkL0MBCnoGPqFG0pw6Vx2Y725t8OaNlYfAV4aEmsYbfTNagvIAO2JmDTjJmkqsR+ i3tg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="c/BBauTu"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzog2d5qkgqe2h4cgdy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBZOG2D5QKGQE2H4CGDY@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 l2sor338153pgl.84.2020.09.29.23.19.17 (Google Transport Security); Tue, 29 Sep 2020 23:19:18 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzog2d5qkgqe2h4cgdy@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="c/BBauTu"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzog2d5qkgqe2h4cgdy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBZOG2D5QKGQE2H4CGDY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446757; cv=pass; d=google.com; s=arc-20160816; b=o8UI4bMcjTkGCoel+V8Hy7ZCW3fqWnyvbooS5orQ09d9O2UNz+Z2r69FespTsZ2Q0Z CDMk0YGsCqodVJgWTKVKWJO6glFpONTd8Yl6zZkatN8p7NTznpbTzczvixDnF+fkAkqQ 7va1G041hLq7uU1ohO8nsx5II2S9TkGXGBXDMXHhvRdfQAiNJUsRg1Ib5T9NxsRPfbjv wd19ODeXSBY4ZKiWVkj/FtjXFHapTNioSBk87+lXIU3rZhd2dN1fh3Hy0wu/rP2FYO5g JoQ1cMtxIhOrrSUn6Gu93wB1nwgNgEC7dhRRk8mboj+VSv12aQmWGGrP2/RyQ/kgkVc8 1LOQ== 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=meN8Vjuwuuq3EVcBsbT/7rnCVnr9nCwlQpPoTDHEGIU=; b=uqMwhQehqmRjW+YNlHfeqfL3eFt+7rIlsNzn1SNVtcnEDFwg0+YKOfGaHuvR1AyvQz 5d5rUvAb2JrUITCmdJ5rnD/LSfiooC0oqb679COdx6eRRX/RWiJzgPQGfTRWSyLdRM32 8M4QXPuhyyKSFUQR8gWwy0kQrR3Ff0Y3gAONPhSsyWodUVPTo9eyY8G3Kvp7lBcUTgAz R2QeA3tuLo9d7jXZPwvI5WlIRmPFRkfp52L1ETFLSav+rjbaeb0PQKQ+50OWBOFE/lsr Fi3vUzNYxQ+/1EH1ZzaewsHcHnPwyTElSZWiaTIlys3vFN9uM+WabwQQh+N9Nhx877R+ xzOg== ARC-Authentication-Results: i=2; 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 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=meN8Vjuwuuq3EVcBsbT/7rnCVnr9nCwlQpPoTDHEGIU=; b=c/BBauTugPj+tB6VjhEoX7aG9hJ7hN01LCMYEmzP3EvcvmieghM1ZaDNBNTHF7vqS/ X8/YrHsX/6kcCCpNOOH3/Z76DNxWKYrXN88OHWfADDTlMj7sbOLZ/pex6HxpTVvbFtPG zE+8s76Bzh1O4lQndPSVPn67YPqHhNnLsAW5Lpd7RHVOYGEsQDBYVm0eZWDL++g9nmbd rxJcUceHyY43diKSOmBrpOGdlyVpnYhCkVQVkRu4mQSLEV1J8Ph7YyyRBpOQ0nMBbArN 9H1Ld91hwRdn/R0V+RcquaRKJdBU3ccpMC7dTnlUTcA/fmr6VeoVNHZZZEMUJNwg9e+B nBxA== 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=meN8Vjuwuuq3EVcBsbT/7rnCVnr9nCwlQpPoTDHEGIU=; b=h1B5v/qBtpIccQ98X2qNhbzF9YFGdOGbZAIGSVOtIepi+zgCbAV+KAeo/HlnsrYGsQ ityi5/JQHo2V4kMiEg5klkP6RcBEy8DmvNCvYs9Mak4C8Gh31dnZGXpNj7E0Iy0vEwcQ yopedvAfN+IxtE5vu/gooivkRNuDHqbMbccpKTYBLd47zTFalmYIZCHObg44Bu43OyQN SfQO7IkB5GAXM73PdFC3vffdF8jfjbpeJ2i/bNcGj/HVY2u/oxy8sRe8oS7wtzq5PX/8 eEN0EYWMvHpVdBMQ/581FVVWe/f5cMxS/X0I1f3Ac+hCK3VPLFBHWpxscAMAKOi4vS2z 3DvQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5331Ij1idrymGM3zkTskqu1qwoPWI5g1XpMVUb3caNBanHb7zxkM ZrXZ+YI5BYqhx27Inj6n2as= X-Google-Smtp-Source: ABdhPJw04B+GE9JfSvF+gtAC7Zw+kmDnp6bJSOL1wC+7TFr4lN5KMZOrRvMTajmBL7QB3WykpzR9mw== X-Received: by 2002:a63:1b44:: with SMTP id b4mr952152pgm.175.1601446757603; 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-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 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; 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 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.129.153 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?1679238635816348395?= X-GMAIL-MSGID: =?utf-8?q?1679238635816348395?= 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)}"