From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7104628192786251776 X-Received: by 2002:a05:6e02:1a0b:b0:2d3:d8b3:10c4 with SMTP id s11-20020a056e021a0b00b002d3d8b310c4mr3078186ild.164.1654175155599; Thu, 02 Jun 2022 06:05:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6638:3010:b0:319:c97e:f47d with SMTP id r16-20020a056638301000b00319c97ef47dls1109643jak.1.gmail; Thu, 02 Jun 2022 06:05:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx14uMTaTt5vU06kFV7hnafQM8QR+Bo1KBHxzCSFLGRazZu5eq/p1woA0f3JmBj02a3ytDz X-Received: by 2002:a05:6638:4111:b0:32e:a19d:bf55 with SMTP id ay17-20020a056638411100b0032ea19dbf55mr2829344jab.259.1654175154569; Thu, 02 Jun 2022 06:05:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654175154; cv=none; d=google.com; s=arc-20160816; b=rDEXMR5Eg1dbr2KZnfNZe9rg7zYdEiVgyPz3dUbkXdGk8X/SLLzWDjEu1BPq5RrCke IB16pfYIpC2aXrdlzwJjK/jNjqaWKjDkYS1e9ECzchcdfwY6kn1wdzef7ro+MPOBQchV 8Vdbl+CoNKnnunHQZNl+xPW0Jy+ImbK+mvnUUKB8iUUtb3zBEBLemlfb+vj1EQId224k 2YZfHKsdPgCVJOGL5VKzEP36bUgjM7QGbyIQwJKC1w6vtldiTQJaxC0DrGOKSiC+wVr/ n9aCGHWaTnEaLPgNXfahhVLc3iBKVCcBgtPiP7MrN6Cg6dcy9vQTiO7DItXNgVUf/BMw Hocw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=xtRz5HixfYqCqs36ES1LFTK3rC++GymyzHsasL9RWFQ=; b=VhYHqMImWFbtnxBNGGKjg8HqYev4aHM9o+6bKyOrq0/ZYTyXtyTU0BvsLZ48BBvsPL Z4fd56adBad6/YJiJD+aYBevfQlo6CZfbeKw4hEEQZ6viLrDMTgeoppnRjCp3auvmZDR MbJW/ggktlpbPjSBs+zBr5Kbb7/UrLdgnp3CoK8CBIxb2lKgXD3FSrZKB9Qhx/VvKbI6 nXKHboGC4P8GFyVUTgm9U8T9RHnatCEBkDtvwZWdlnTeLVokd+sgLiDTmY59g3pAqyis wHxwrxip4rZin/d2aXvWvt38QmJcmz+pw/gZSIN8Kok2JjEy1ICUYve+wtpqvkp9FOrz vvwQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 190-20020a020ac7000000b00330ebfb4c33si196950jaw.1.2022.06.02.06.05.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Jun 2022 06:05:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 252D5q2P010259 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 2 Jun 2022 15:05:52 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] meta: Explicitly undo wic mounts Date: Thu, 2 Jun 2022 15:05:52 +0200 Message-Id: <20220602130552.27997-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: ew/j/jqLvyhc Creating wic image requires some host paths be equal to buildchroot paths. Thus, we have a situation, when ${STAGING_DIR} that is equal to ${TMPDIR} needs to be bind-mounted under it subdirectory so that path to the image rootfs under buildchroot was the same as path outside. E.g. we have the following mountpoint during wic imaging: ${TMPDIR}/work//buildchroot-target/1.0-r0/rootfs/${TMPDIR} In this situation, an issue was caught under some chroots, that final event-based unmounting didsn't completely unmount everything. This was reproduced, at least, under buster host and bullseye chroot. This fix solved the problem by explicit unmounting wic-related mounts. Signed-off-by: Uladzimir Bely --- meta/classes/imagetypes_wic.bbclass | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index 61a74d4a..ef8b3b5f 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -146,6 +146,7 @@ IMAGE_CMD_wic() { wic_do_mounts generate_wic_image check_for_wic_warnings + wic_undo_mounts } wic_do_mounts[vardepsexclude] += "BITBAKEDIR" @@ -164,6 +165,20 @@ wic_do_mounts() { EOSUDO } +wic_undo_mounts[vardepsexclude] += "BITBAKEDIR" +wic_undo_mounts() { + sudo -s <<'EOSUDO' + ( flock 9 + set -e + for dir in ${BITBAKEDIR} ${SCRIPTSDIR} ${STAGING_DIR} ${BBLAYERS}; do + if mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; then + umount ${BUILDCHROOT_DIR}/$dir + fi + done + ) 9>${MOUNT_LOCKFILE} +EOSUDO +} + generate_wic_image[vardepsexclude] += "WKS_FULL_PATH BITBAKEDIR TOPDIR" generate_wic_image() { export FAKEROOTCMD=${FAKEROOTCMD} -- 2.20.1