From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750962531146137600 X-Received: by 2002:a17:906:2d49:: with SMTP id e9mr964786eji.240.1571830951701; Wed, 23 Oct 2019 04:42:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:a3d7:: with SMTP id ca23ls435551ejb.0.gmail; Wed, 23 Oct 2019 04:42:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7YKPh8oPcMxhnYAVqK3cCaEPlGP+IVrMtiJHNrlaKcqt0lz+URtvCYS465XcxpIm6Q3Zp X-Received: by 2002:a17:906:6449:: with SMTP id l9mr32745703ejn.187.1571830951175; Wed, 23 Oct 2019 04:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571830951; cv=none; d=google.com; s=arc-20160816; b=wsWQfWH/wOjjlOppyYIl+yVHESjHwbZTyUxmL78qPqddfbgr3c/hdVZX6hAZoxp+vJ 3T6UisaSLCDFugEmP/nl/4VHPovJpWe4b9OPRJ5LAV0Rz8lNiCrBs92wapeHlrT8reAc vAyG/De4TqfqILbXO1CPzNLQuNAgEmNEqpCKPSXs2d9zSwV8eBAMLVeHDZG3JMHF0zFA tQtEhterGOMkGeOjel0ZddQAUgOYZteJ5QIaa2Vwu35RhB9bDqH2zKfRKd3EAIg/5yVU N3Xhf/dYXVkjHx3BhQSHnFNx8Mf+ZZQ72zEYA1hkJkN/R4kpUx3hTJBabUT1GGZ+wpeb I7yQ== 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=379wZWvviTLIm5xUOsFOAVWpUZlKuSge8MzjqlsihKI=; b=PpYs248mDjtKzrRTi33YzQChAGSXgJdLKmp3rXGB6txxHG8mYNQE3RBX2EqhUVrwxB QhJj3SzzW13dqKJQhUAvQ+Nt+YP45hWh6xgJIV1dqAl31nV9BHA9+2JNEw5jRWjzqZrt vFWyByMh3CUu51Zo60ME+TKYqmPDxKiaHRR79gGiqH4r6z3/4MBLtg8c9MM9AmdK+90S 4CgwAQew4LESSzF0JVbnL9ltYKpgMBj/y3kFrK4jvuBvLCZv1Uo9W+7sA41eIY0O9e3j TG/h/+1dBkxtH5SpHtD9nNwdXlHvpKThZ07pVTB+hfNFdcpD94LcnTwQGhcbB3XMz2dB /usw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@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 a15si1259379ejj.0.2019.10.23.04.42.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 04:42:31 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x9NBgU4Y016061 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 13:42:30 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.8]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9NBgUEK024249; Wed, 23 Oct 2019 13:42:30 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv2 8/9] meta: do not equip rootfss with resolv.conf when BB_NO_NETWORK Date: Wed, 23 Oct 2019 13:42:26 +0200 Message-Id: <20191023114227.31308-9-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191023114227.31308-1-henning.schild@siemens.com> References: <20191023114227.31308-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: aOQDDIAFZJKX From: Henning Schild A second "line of defense" to implement BB_NO_NETWORK in Isar. Signed-off-by: Henning Schild --- meta/classes/buildchroot.bbclass | 10 ++++++++-- meta/classes/rootfs.bbclass | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index 64ac450..1a8ee13 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -48,8 +48,14 @@ buildchroot_do_mounts() { mount --bind '${REPO_BASE_DIR}' '${BUILDCHROOT_DIR}/base-apt' fi - # Refresh /etc/resolv.conf at this chance - cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc' + # Refresh or remove /etc/resolv.conf at this chance + if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" = 'True' ] + then + rm -rf '${BUILDCHROOT_DIR}/etc/resolv.conf' + else + cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc' + fi + ) 9>'${MOUNT_LOCKFILE}' EOSUDO } diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 995dcb6..84d4dc5 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -105,7 +105,10 @@ rootfs_install_pkgs_update() { ROOTFS_INSTALL_COMMAND += "rootfs_install_resolvconf" rootfs_install_resolvconf[weight] = "1" rootfs_install_resolvconf() { - sudo cp -rL /etc/resolv.conf '${ROOTFSDIR}/etc' + if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" != "True" ] + then + sudo cp -rL /etc/resolv.conf '${ROOTFSDIR}/etc' + fi } ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download" -- 2.23.0