From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6906006289225089024 X-Received: by 2002:a2e:b047:: with SMTP id d7mr5250346ljl.467.1607929890660; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c886:: with SMTP id y128ls420283lff.0.gmail; Sun, 13 Dec 2020 23:11:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzdDCGi0xR3v2iWPyV+QXfkZ6kNNDEEX4gX05iZ63af7R0o2dbofpUS2TQElaz7IYJBRCS4 X-Received: by 2002:a19:8116:: with SMTP id c22mr9341129lfd.211.1607929889500; Sun, 13 Dec 2020 23:11:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607929889; cv=none; d=google.com; s=arc-20160816; b=VN+xUTHY5vxOjXlQSqQs9OQsvwNX9TCIaXhToXe9pskj7sJV+NUV8sNcoyb48Fzc9d ZttAqJQbm0UT2B7XGZSezfQVTTVebv3ixOfRt2q03oSDdN5cunK2dhQxq8PI4jRIh/e5 leTKmLRlwfJREKu5IV9OFxrf/xQcKRhCk+C5yBTUbpvWUM9JCwmwEOgsuUZokAjriXG7 xbqk3BHh9u3j3pDX1Kd2cRTIgHbv2pF0rw5SKXCzLcK3YbxM1HXxpJs02KwhAtzx3og3 WzpeLdjuhgZjEH2+uJxTgQ1UsPgzcREzuFPvOf7YQY7VE+28Cd945YypmVO3Ov7pb/NJ pxxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=FVZZ5sG/D4918jBTmx+FPdHWB/7YRsp8q+8p8t9P5Tk=; b=NcA3qX3FClyZYJh5Lj6GJUNkvXaL7JW9U7Q/2K4/RcNmpohBWfeFZD1rCUSwOQwO6E Ikmzh7qLX0Em/gxzV8NvTNTsTLno3maBkTCF3sBHV7XTFty0Tvo+OAsIKr1f3e6nL91N ug2FtpnbBNPx0AtcPokO8/u1cpa7yxggm19tSLeFh0s6OIQGcnnWf2Vf/kvC3kB66wSy gDk7Dv2vH3xjmyS1NIEOq0yeqcVetlyAjy5SCSzTj7tbJWw5pjLRB5av7pKTpFb05mVI 3/56iaqJKKVAKAD/2bvq3DeeBwh62qMYxI6eOVtUwewP9xDB27/7RcOd5UgLlbAsSS3Y WIAA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id c15si11283ljn.0.2020.12.13.23.11.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Dec 2020 23:11:29 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 0BE7BSQx006592 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:28 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXb030825; Mon, 14 Dec 2020 08:11:28 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 4/6] meta: cache_deb_src: Account for the case that resolv.conf is a non-existent link Date: Mon, 14 Dec 2020 08:11:25 +0100 Message-Id: <4b141fb9b093959f1e20cb315eece734480b5963.1607929886.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: bsqpha6LHEwY From: Jan Kiszka This is true if systemd-resolve is used, like on Ubuntu. Signed-off-by: Jan Kiszka --- meta/classes/rootfs.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index efed0f65..f9151c5b 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -186,7 +186,8 @@ python do_rootfs_install() { addtask rootfs_install before do_rootfs_postprocess after do_unpack cache_deb_src() { - if [ -e "${ROOTFSDIR}"/etc/resolv.conf ]; then + if [ -e "${ROOTFSDIR}"/etc/resolv.conf ] || + [ -h "${ROOTFSDIR}"/etc/resolv.conf ]; then sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar fi rootfs_install_resolvconf @@ -199,7 +200,8 @@ cache_deb_src() { debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO} sudo rm -f "${ROOTFSDIR}"/etc/resolv.conf - if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then + if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ] || + [ -h "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then sudo mv "${ROOTFSDIR}"/etc/resolv.conf.isar "${ROOTFSDIR}"/etc/resolv.conf fi } -- 2.26.2