From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6605860083084558336 X-Received: by 2002:a2e:8551:: with SMTP id u17-v6mr339426ljj.41.1538046657114; Thu, 27 Sep 2018 04:10:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:4f01:: with SMTP id d1-v6ls374055lfb.12.gmail; Thu, 27 Sep 2018 04:10:56 -0700 (PDT) X-Google-Smtp-Source: ACcGV601ncG8PEcpBvEzlQQY37GsUsXhG9+XTaZ+mckIR/LZHWhNlcCccFcwIt4rf15/OHgkpxrt X-Received: by 2002:a19:f816:: with SMTP id a22-v6mr303705lff.39.1538046656493; Thu, 27 Sep 2018 04:10:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538046656; cv=none; d=google.com; s=arc-20160816; b=bg7k20k+He2beyDXoaL0USxi0Nbi3SommolbhQl5860hbyhH2X7VJ1pUaIEIJvO9BM L+2mcQtR8B+y4saeURcREtzwjaB8foOEGBRl+Jy1qTD+CqcZxaXOJuZyMwrrfAwrkpYg 0zEGkXizfy1OltXY5tPHwVwMmSvg8XikJw3PuACtcwfSmlqW70ZC9EZMYcdRjui1PyGS VLbStPpG7AZquSvVYExbbSNDva2/qlCWQCgONIeuL6//PekRujvC5nBVX8YPknhD4jr4 ZZnSRRJXo1H4RzU4HfcFQyo3sWV6uA8sgjLnujhTx3gwyKTmWZnkJ9rGbbyyWVonaZOt sLbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=OHajOEi8MY3px91Ztx4NbOcsQpNhW+s4dNnszx++Tyk=; b=vk0YOHhy/+AwBaIuC7jNfyUqYmlNxKBK5KabsG0PAsAfq9qQWEBFLg9VWPlV35gIfW pAy7kD5qtCvFY6hO112sN0Hc5TAebU/j4mDeyGnByGw62BQMLCgS9SLNxt5GY4+TOaHP 7d+ZdCr25e8lQi/Jpy6QEbk28s9OwaImYSCVcY+GM6SwSria62TND458VeuoKc7nSfZa d/TRg8mDs/Mjq8DixSRvVJWBo9fo4NXHTv4sWkYMyeduLNBuPicmQ1HXIOVEFeTNB9y7 50dd5Cp7ZjWUxFjeJzkro/z8P1VDLYPi83iGz3tKKe0NRdZSnQ9LdEXv4OcMaBL653HP v/fA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id v82-v6si57795lje.2.2018.09.27.04.10.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 04:10:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w8RBAdpg024471 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 27 Sep 2018 13:10:55 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 2/2] sdk: Check if directories are mounted before unmounting Date: Thu, 27 Sep 2018 13:10:39 +0200 Message-Id: <20180927111039.16872-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180927111039.16872-1-mosipov@ilbers.de> References: <20180927111039.16872-1-mosipov@ilbers.de> X-TUID: YYsVtIrNV/Kv Signed-off-by: Maxim Yu. Osipov --- meta/classes/image.bbclass | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 1db2394..3206877 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -98,6 +98,16 @@ addtask copy_boot_files before do_build after do_rootfs do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files[stamp-extra-info] = "${DISTRO}-${MACHINE}" +is_mounted() { + dir_dev=`stat -c '%D' "$1"` + parent_dev=`stat -c '%D' "$1/.."` + if [ $dir_dev != $parent_dev ]; then + return 0 + else + return 1 + fi +} + SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}" do_populate_sdk() { @@ -107,8 +117,10 @@ do_populate_sdk() { # Purge apt cache to make image slimmer sudo rm -rf ${SDKCHROOT_DIR}/rootfs/var/cache/apt/* + is_mounted ${SDKCHROOT_DIR}/rootfs/dev && sudo umount ${SDKCHROOT_DIR}/rootfs/dev + is_mounted ${SDKCHROOT_DIR}/rootfs/proc && sudo umount ${SDKCHROOT_DIR}/rootfs/proc + # Create SDK archive - sudo umount ${SDKCHROOT_DIR}/rootfs/dev ${SDKCHROOT_DIR}/rootfs/proc sudo tar -C ${SDKCHROOT_DIR} --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \ -c rootfs | xz -T0 > ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz -- 2.11.0