From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6629320495720300544 X-Received: by 2002:a50:aeaf:: with SMTP id e44mr532538edd.4.1543508958825; Thu, 29 Nov 2018 08:29:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:1304:: with SMTP id w4-v6ls536006ejb.10.gmail; Thu, 29 Nov 2018 08:29:18 -0800 (PST) X-Google-Smtp-Source: AFSGD/X5Y6KI1oiG1qPpeTf0xWnh0yx8MYhCXvgBzq9mZORdxxd11ini+8WzPYEuMTwxv2ZXhCxX X-Received: by 2002:a17:906:78c5:: with SMTP id r5-v6mr479640ejn.16.1543508958287; Thu, 29 Nov 2018 08:29:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543508958; cv=none; d=google.com; s=arc-20160816; b=QaeA+EUyiAu0mFYZkWyD3Ici1eqnJZuvhA7LMaa/uUgZrty37u7Q6PfDxx290NutR+ S06SvyMYhvmrLWGhZRrndCfyWIZRTJjjaCfEr/dXScza4P9XFHVqpCwQsFubKDYarT0l rzuDYaw8HpfWw/UpB5b7ydjoCUYGRqlKl6JKZUycsvdxsHtHuoyM99HF9xGVwEbGFCAD EQH8w9QPOdpkFr6hga6XhPh9QOV7Ei/c4CW+F53PLWaEKkUxNPLu6tj0oPKUjcNJxyY7 1TNg9hx1AqH0VhrU6VO2A3ieHAJm7x0g56B9JElvsHWVFqo4lBtb/scsW2fN+aLnlbfy ydAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:to; bh=ygbMdAvqzVRdfPDxlt0KC6zkFLrIbO1N8WrVgbsKHZk=; b=Dfsgth7HNKGR+ku/DyLKR4siET1SiIl5HWBcA55D/GsMhz1rYORC0R2PxYy/pbjOhz LNe4hoXzRn5N84zQrGBITXo7Nxf0QK5YR9hc06TzlNF98dfUqhCiuoXLCgCC+8eaUZSy UnP5J7IIW3DnXH6/sc1QaHX5QGmWfShgTB8XScPM/VD7Sj0QPrt4Lp0hqa7+/ZU8cKTJ z7XV64Gn2Y9b81NfAHgLDU422xyx6ifgXBXnm/gYZUz8juqGCk+hLc/HLOg36CJiK+iQ XwJHkhPVJEaPVzd6GN11KGgCjjl0iiTymxa2i6JWgX+3o/XAgcDrjL6ckY3yu/oKwGwn XKFw== 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 Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id i17si82652edg.2.2018.11.29.08.29.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Nov 2018 08:29:18 -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 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 wATGTH3P020542 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Nov 2018 17:29:17 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wATGTH9x006619; Thu, 29 Nov 2018 17:29:17 +0100 To: isar-users , Maksim Osipov , Cedric Hombourger From: Jan Kiszka Subject: [PATCH] isar-bootstrap: Fix and cleanup bind mounting Message-ID: <6f5714bc-d5f5-c08f-c408-b32bab9169fc@siemens.com> Date: Thu, 29 Nov 2018 17:29:17 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 4PyDdgpyX+dJ First, wrong variables were used (there is no BUILDCHROOT_DIR for isar_bootstrap). And then we simply left the mount points active after completing the bootstrap. The led to setup_root_file_system copying all the mount point content over into the buildchroot or rootfs - including base-apt when it was used. Signed-off-by: Jan Kiszka --- This is a precondition for "isar-image: umount base-apt when doing offline build" to work properly. IOW, that patch reveal these bugs. Possibly, this also explains the increasing mount count that was visible in CI. meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 8ea3b08..da077d0 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -185,12 +185,8 @@ isar_bootstrap() { sudo -E flock "${ISAR_BOOTSTRAP_LOCK}" -c "\ set -e if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then - if [ -e "${ROOTFSDIR}" ]; then - umount -R -l "${ROOTFSDIR}/dev" || true - umount -l "${ROOTFSDIR}/proc" || true - umount -R -l "${ROOTFSDIR}/sys" || true - rm -rf "${ROOTFSDIR}" - fi + rm -rf "${ROOTFSDIR}" + if [ ${IS_HOST} ]; then ${DEBOOTSTRAP} $debootstrap_args \ ${@get_distro_components_argument(d, True)} \ @@ -247,17 +243,22 @@ isar_bootstrap() { "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" # update APT - mount --rbind /dev ${BUILDCHROOT_DIR}/dev - mount --make-rslave ${BUILDCHROOT_DIR}/dev + mount --rbind /dev ${ROOTFSDIR}/dev + mount --make-rslave ${ROOTFSDIR}/dev mount -t proc none ${ROOTFSDIR}/proc - mount --rbind /sys ${BUILDCHROOT_DIR}/sys - mount --make-rslave ${BUILDCHROOT_DIR}/sys + mount --rbind /sys ${ROOTFSDIR}/sys + mount --make-rslave ${ROOTFSDIR}/sys export DEBIAN_FRONTEND=noninteractive chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \ -o Debug::pkgProblemResolver=yes + umount -R -l "${ROOTFSDIR}/dev" + umount -l "${ROOTFSDIR}/proc" + umount -R -l "${ROOTFSDIR}/sys" + umount -l "${ROOTFSDIR}/base-apt" || true + # Finalize debootstrap by setting the link in deploy ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" fi" -- 2.16.4