From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6487873763254730752 X-Received: by 10.80.201.7 with SMTP id o7mr288103edh.3.1510581420660; Mon, 13 Nov 2017 05:57:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.144.196 with SMTP id d4ls969286eda.4.gmail; Mon, 13 Nov 2017 05:57:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMboDC5WPpb61DcSu/5Qmzpb2uOyaLL103CGV2rsDVfai6vP/6xPuySfIdq9VuL3SmPzhumU X-Received: by 10.80.201.7 with SMTP id o7mr288100edh.3.1510581420347; Mon, 13 Nov 2017 05:57:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510581420; cv=none; d=google.com; s=arc-20160816; b=O0SbCSQt9v/gL/RLv7C3BRyPrEILa14iLVj18XxnsyAvSV/Gn4vOIFOI3vgEJNRoim PzH1VtwdeJ5r6dQzgYbD+iqwh/7NIlIvnYHlNH/yk3JgEbwBzSe3XOnjzG6u/Od3VJoK oRfA4b8rHNnfofajvRyfk9AsjTvlrqPsp8CrsRzeH0ZamxEaSaAd+ivoBiaC2i9Beuoz jy6WMKcUiJdO2lkuudCjyot85d/5kS82bj8OINamYINlx5MFh5niYgf08mmUeGeY8l7B kBnPAiTbOxgQv7XTzz7nk+X/YdU2Z4et3JWKYkWZBaNO4RbP5Hq2kY65iLU51uQWmRa8 13JQ== 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:subject:cc:to:from:date:arc-authentication-results; bh=lBODhgNdCMiBuFqpHZtgeVjHIvgH9+QnkZERKsbKdBs=; b=iuoRa8GK9cakr96Z5hwyutVMjUJRX8oeYEUBFsaP3U/Fxqp7YNGvQz/rMCtCKu8AnP jF/7Il4aGnUef7fk8Q/owqh3NGLHyCiWnvjabtuHsUAFtdezkzZVHtEJwan38eJ+h508 SkLASbdVRIo/3bkw1iTj7WYL0ZNo5VWZ1/WMJCATTYflaCpc9SfWeXTY1KFXofFqRXEY sFAL5qi/3cgS+JikqTJmvgYFu7nFhwiwFK20Rg7K8yZ8X5aWO0NfeTS8r7xX29sJ2Cvi /KsEWMQsHjQw36B88n0fOMlFtwzsUzIaVslFms78FiCLl9TYR3PMXTDHb99qE2U6U2Na 4dQw== 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 Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id i6si1514294eda.1.2017.11.13.05.57.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Nov 2017 05:57:00 -0800 (PST) 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 Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id vADDuxep013007 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 13 Nov 2017 14:56:59 +0100 Received: from md1em3qc ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id vADDuxOE006595; Mon, 13 Nov 2017 14:56:59 +0100 Date: Mon, 13 Nov 2017 14:57:12 +0100 From: Henning Schild To: "[ext] Christian Storm" Cc: Subject: Re: [PATCH] isar-image-base: fix some dangling mounts Message-ID: <20171113145712.1b259253@md1em3qc> In-Reply-To: <20171113122239.19792-1-christian.storm@siemens.com> References: <20171113122239.19792-1-christian.storm@siemens.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: 3uPtaBJxWM7l Cool, i suggested before to use exception handling for that problem, just did not know how that is done in bb. Henning Am Mon, 13 Nov 2017 13:22:39 +0100 schrieb "[ext] Christian Storm" : > As bitbake/lib/bb/build.py's shell_trap_code() injects > `set -e` into scripts, the premature end of scripts leaves > dangling mounts around. Fix these dangling mounts by hooking > into the EXIT trap handler also setup by shell_trap_code(). > > Signed-off-by: Christian Storm > --- > meta-isar/recipes-core/images/isar-image-base.bb | 10 ++++++++-- > meta/classes/dpkg-base.bbclass | 10 ++++++++-- > meta/classes/ext4-img.bbclass | 10 ++++++++-- > meta/recipes-devtools/buildchroot/buildchroot.bb | 10 ++++++++-- > 4 files changed, 32 insertions(+), 8 deletions(-) > > diff --git a/meta-isar/recipes-core/images/isar-image-base.bb > b/meta-isar/recipes-core/images/isar-image-base.bb index > 42aaea3..c2150b1 100644 --- > a/meta-isar/recipes-core/images/isar-image-base.bb +++ > b/meta-isar/recipes-core/images/isar-image-base.bb @@ -52,8 +52,14 @@ > do_rootfs() { -e 's|##ISAR_DISTRO_SUITE##|${DEBDISTRONAME}|g' \ > "${WORKDIR}/multistrap.conf.in" > > "${WORKDIR}/multistrap.conf" > - install -d -m 555 ${IMAGE_ROOTFS}/proc > + [ ! -d ${IMAGE_ROOTFS}/proc ] && install -d -m 555 > ${IMAGE_ROOTFS}/proc sudo mount -t proc none ${IMAGE_ROOTFS}/proc > + _do_rootfs_cleanup() { > + ret=$? > + sudo umount ${IMAGE_ROOTFS}/proc 2>/dev/null || true > + (exit $ret) || bb_exit_handler > + } > + trap '_do_rootfs_cleanup' EXIT > > # Create root filesystem > sudo multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f > "${WORKDIR}/multistrap.conf" @@ -62,7 +68,7 @@ do_rootfs() { > sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} > ${MACHINE_SERIAL} ${BAUDRATE_TTY} \ ${ROOTFS_DEV} > sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" > - sudo umount ${IMAGE_ROOTFS}/proc > + _do_rootfs_cleanup > } > > addtask rootfs before do_build after do_populate > diff --git a/meta/classes/dpkg-base.bbclass > b/meta/classes/dpkg-base.bbclass index 9ded3ae..35af6d5 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -21,9 +21,15 @@ dpkg_runbuild() { > do_build() { > mkdir -p ${BUILDROOT} > sudo mount --bind ${WORKDIR} ${BUILDROOT} > + _do_build_cleanup() { > + ret=$? > + sudo umount ${BUILDROOT} 2>/dev/null || true > + sudo rmdir ${BUILDROOT} 2>/dev/null || true > + (exit $ret) || bb_exit_handler > + } > + trap '_do_build_cleanup' EXIT > dpkg_runbuild > - sudo umount ${BUILDROOT} > - rm -rf ${BUILDROOT} > + _do_build_cleanup > } > > # Install package to dedicated deploy directory > diff --git a/meta/classes/ext4-img.bbclass > b/meta/classes/ext4-img.bbclass index 18a74ca..83cb137 100644 > --- a/meta/classes/ext4-img.bbclass > +++ b/meta/classes/ext4-img.bbclass > @@ -19,9 +19,15 @@ do_ext4_image() { > > mkdir -p ${WORKDIR}/mnt > sudo mount -o loop ${EXT4_IMAGE_FILE} ${WORKDIR}/mnt > + _do_ext4_image_cleanup() { > + ret=$? > + sudo umount ${WORKDIR}/mnt 2>/dev/null || true > + sudo rmdir ${WORKDIR}/mnt 2>/dev/null || true > + (exit $ret) || bb_exit_handler > + } > + trap '_do_ext4_image_cleanup' EXIT > sudo cp -r ${IMAGE_ROOTFS}/* ${WORKDIR}/mnt > - sudo umount ${WORKDIR}/mnt > - rm -r ${WORKDIR}/mnt > + _do_ext4_image_cleanup > } > > addtask ext4_image before do_build after do_copy_boot_files > diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb > b/meta/recipes-devtools/buildchroot/buildchroot.bb index > ace64ba..4cae9fc 100644 --- > a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ > b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -52,8 +52,14 @@ > do_build() { -e > 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ > "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf" > - install -d -m 555 ${BUILDCHROOT_DIR}/proc > + [ ! -d ${BUILDCHROOT_DIR}/proc ] && install -d -m 555 > ${BUILDCHROOT_DIR}/proc sudo mount -t proc none > ${BUILDCHROOT_DIR}/proc > + _do_build_cleanup() { > + ret=$? > + sudo umount ${BUILDCHROOT_DIR}/proc 2>/dev/null || true > + (exit $ret) || bb_exit_handler > + } > + trap '_do_build_cleanup' EXIT > > # Create root filesystem > sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f > "${WORKDIR}/multistrap.conf" @@ -63,5 +69,5 @@ do_build() { > > # Configure root filesystem > sudo chroot ${BUILDCHROOT_DIR} /configscript.sh > - sudo umount ${BUILDCHROOT_DIR}/proc > + _do_build_cleanup > }