[PATCH 3/3] Remove redundant recursive umounts

[Jan Kiszka <jan.kiszka@siemens.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

Lazily umounting also ensures that depending mounts are removed.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 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