From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6631438923266523136 X-Received: by 2002:a2e:9902:: with SMTP id v2-v6mr2048634lji.6.1544002193785; Wed, 05 Dec 2018 01:29:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:520f:: with SMTP id m15ls1894681lfb.5.gmail; Wed, 05 Dec 2018 01:29:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/UPgQt55iX+QA674nfnEOfqDJAzPpfdP5Kd2eEUKTJ32KhPfyDnxo92f+H0pom5qI/7p8eF X-Received: by 2002:a19:7510:: with SMTP id y16mr1878982lfe.9.1544002193101; Wed, 05 Dec 2018 01:29:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544002193; cv=none; d=google.com; s=arc-20160816; b=M8fEugOAw3GudmkYiVQFBdxemxWwsY+vLdh2im90JcsuS40olkBYWqy22YElToJIwE Z2xcoTdtOGhnNrLfJ4oHP+wO2QDWSYCvap3iB994LYecnAsK52m2IHSrPU/bdhp1qlKU pUf0vHcHuOkwNnKNj5m70TknFuN20BkTDvRdQEenU6giuz9mAejhl3yIPFDUx7f2S44j rJLf5c4I/nmpHyfcWzrTeC3IypPTnItfw1Y/2DWArnMsR6so/NqbTiMVaOU1uf0U4Z9P Is8/OVMtRBOq3g5GwfVohYszQWcVuT/kuW87KtTs6cchMkCQXz006WQlR/YfxdyPgxgo 3esQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=OGNg4VZzXdpBWZ9ayrbb2Wx/ZFBWcIwfem6NR25Ot/8=; b=GCZ1GsBxe+A+ilcG8QIJwSXJ6088dRiyDnziqXjcZ2T68hY928im4KVd8PiGSzTRzK 3b/sSeh9bjQTltZ5F7tBMtKDhxd4CZeXcEyd+R4mhUbzCHhYH+OjfQAgH1nhXREy3E31 PZQmZ9GBQB4RmULOXqqJyxQG5FJoxA99ygv5TMWI8WjhIFdEqn2XflKfz7I8iwwIhwAF xedacyRxTlW6JwDKdzo7AQHGdrp3RLHnRf4T2qWMx1Gx9wmLI7OrgpsfZZKvvtdgDzBZ 5BvKtdHh0SoYzh5TjLO/5PRcs65RpQHbl1NWfOHjy0zxn95mtHsYmEKKArnSAwWD0BJf u3tg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id y18si790008lfe.3.2018.12.05.01.29.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 01:29:53 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id wB59TpOc015742 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 5 Dec 2018 10:29:51 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.1.27]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wB59TpO1010907; Wed, 5 Dec 2018 10:29:52 +0100 From: Jan Kiszka To: isar-users Cc: Cedric Hombourger Subject: [PATCH 3/3] Remove redundant recursive umounts Date: Wed, 5 Dec 2018 10:29:50 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: H6dkJ/VP0aL6 From: Jan Kiszka Lazily umounting also ensures that depending mounts are removed. Signed-off-by: Jan Kiszka --- meta/classes/isar-image.bbclass | 4 ++-- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass index 23b3a99..14b97dd 100644 --- a/meta/classes/isar-image.bbclass +++ b/meta/classes/isar-image.bbclass @@ -59,9 +59,9 @@ isar_image_cleanup() { -maxdepth 1 -name 'qemu-*-static' -type f -delete sudo umount -l ${IMAGE_ROOTFS}/isar-apt sudo rmdir ${IMAGE_ROOTFS}/isar-apt - sudo umount -R -l ${IMAGE_ROOTFS}/dev + sudo umount -l ${IMAGE_ROOTFS}/dev sudo umount -l ${IMAGE_ROOTFS}/proc - sudo umount -R -l ${IMAGE_ROOTFS}/sys + sudo umount -l ${IMAGE_ROOTFS}/sys sudo rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf" if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then sudo umount -l ${IMAGE_ROOTFS}/base-apt diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index da077d0..811d50e 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -254,9 +254,9 @@ isar_bootstrap() { chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \ -o Debug::pkgProblemResolver=yes - umount -R -l "${ROOTFSDIR}/dev" + umount -l "${ROOTFSDIR}/dev" umount -l "${ROOTFSDIR}/proc" - umount -R -l "${ROOTFSDIR}/sys" + umount -l "${ROOTFSDIR}/sys" umount -l "${ROOTFSDIR}/base-apt" || true # Finalize debootstrap by setting the link in deploy -- 2.16.4