From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6816610675337461760 X-Received: by 2002:ac2:5ec5:: with SMTP id d5mr1525522lfq.142.1587115884627; Fri, 17 Apr 2020 02:31:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:89c8:: with SMTP id c8ls293163ljk.7.gmail; Fri, 17 Apr 2020 02:31:23 -0700 (PDT) X-Google-Smtp-Source: APiQypKGueRnEilkdWIXJvXUldvTxrUeiOFokGaXMeC61P2kF1kFyNIS2yZNjKE7raWIWHxwBZnY X-Received: by 2002:a2e:1418:: with SMTP id u24mr1584202ljd.265.1587115883842; Fri, 17 Apr 2020 02:31:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587115883; cv=none; d=google.com; s=arc-20160816; b=Z+fAwRuJONzaQotLo55sSMy/rf7iyTy58arasQZ2NBPfoaHIENvhjQzq+SKCUciW3H oEUpSyhdFhMstDIiSUSjeHPCG6vD26ouJPv4J6alOAou8jQI+U6eycm3M44WF9dL4x6n bfxWA6LKcbu6aftO+RhrtA8Av5tNPKKLkkTPItMHjdRvTa/MtufIEln+mRPxuNHNuD9M DkyXocwB6pwtsOBSO9NqFoPKSr7NRTUu8qV27C9rhKES/rjngZ9LV/qS3lOVYp718BAB XcSclHXoZCI4oV62I5smY3jtmIc9rko21JrH6PwpcOAYtqpWafOmL4CHlDVdmScAxhel 1kGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N3noqrm+TPt4W7+1Ko4rRdHlfA0riDBVevUlcAw62QE=; b=DxKW2pf67ADqykCXVWzuFv3t+/ehkK6HdU5y51Xc5bsBZaucjJnQYHHyD5WkQj7fel zWC4BkXDmr1pntOjXlNXyHl0yF/FZEFhUiQRhhzn83bC89Lr8DEA1k8ZD33QNJz6PkMD E7y34QoG4PNvzQSiH0Yn7AfVpg81im0Ekr42dmpK3kTGZWq+iOCAO+lxlvIX2HpsU1PO uHicESuvd71s+2eiMhiM5ODVfveamfHIhPSY2+lXT7dmdDPeCJz/7jD6LxrPG6iV/Zf4 +KYEptacRGepJojmzPY1Tyjt9ACYk8JP8ML2MUXdUiGqFcT35RNbZHD7gTnvi+34v/bl Y4Pg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=FbCQWDup; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::343 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com. [2a00:1450:4864:20::343]) by gmr-mx.google.com with ESMTPS id p5si1271578ljj.3.2020.04.17.02.31.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Apr 2020 02:31:23 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::343 as permitted sender) client-ip=2a00:1450:4864:20::343; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=FbCQWDup; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::343 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x343.google.com with SMTP id u127so1144445wmg.1 for ; Fri, 17 Apr 2020 02:31:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N3noqrm+TPt4W7+1Ko4rRdHlfA0riDBVevUlcAw62QE=; b=FbCQWDupx1wnmxLf8mFvoOHg7ANLfBWO7b4LANOJKYh8evbQEszkBG/Dup5CJGArq8 b4bPuKaeUMtSmK1WMAMYQq00HZgWyz/PVpq7oEU6UwilJP2Qi3sezfk2DDixdm6HNp6c VLiEXTNJOIOeGUqd/q2KtzLxrZAKtdNbD0p6kg/CSrdbvxUN5W4IDGS4LnKUcE3tzovs K5K1tuP76I9zf38C3ljjopV2U6mWc0c/kRo4d23qV2xgzcLaeb+7ZK/+vpdzxKn8bL+X varcxwSoeL/xo89rDQbbN07Fc+1F5IiUppcS6a78IBBgL4l5ryXgBQdD0yxdaKUl/4cW 4M/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N3noqrm+TPt4W7+1Ko4rRdHlfA0riDBVevUlcAw62QE=; b=qQDfQ+MOZ+WDZIiFt4KWspVxdmp6DUSyCrsea+/gIDgmPbjWzveF3XEUk2Mbx4oYqw 4f98X8Ck9weZNkivhZrUyBxlfqRMqAcM25E0XJXy3DW6ttK6YVei749MUKu1vY2y64Lv bRYKx9RkvE6Y3grSKTTr4ip5Tnp9DlTcSKMKIvZE7g4/62ZNj4eGzZBl8LIji0Ihu27T ma1SqrnS6hwkX5fv8b30KXzmEKctADUZs2TaiJGG+6LXlrp2q0q1vQjB4Rfs6BFlTfh1 wfOfQB4l38JjAQwi77fjNRJ9JpbwfWcaf76lveVkvijc40zGwjkqQ9cb+x3v6SU5div3 LhjA== X-Gm-Message-State: AGi0PuahG33P5MyoSVFwOtZwHijVhY+wPXla5YpUOACx9j2VWIcFEVPm UBxLJF02moyIN3v7rkFqgmVv56+SzHU= X-Received: by 2002:a1c:4409:: with SMTP id r9mr2505300wma.165.1587115883025; Fri, 17 Apr 2020 02:31:23 -0700 (PDT) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id l15sm6836256wmi.48.2020.04.17.02.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 02:31:22 -0700 (PDT) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, ibr@radix50.net, jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH v5 12/13] rootfs: Fix possible overwrite of existing resolv.conf Date: Fri, 17 Apr 2020 15:00:39 +0530 Message-Id: <20200417093040.15130-13-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> X-TUID: jnMmLzUEZhvJ 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 c00a8bf..5d2b893 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