From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH 1/2] rootfs: Execute rmdir only if needed
Date: Fri, 10 Dec 2021 11:10:53 +0300 [thread overview]
Message-ID: <20211210081054.225747-2-amikan@ilbers.de> (raw)
In-Reply-To: <20211210081054.225747-1-amikan@ilbers.de>
We should not remove dirs if they are not unmounted or even exist.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
meta/classes/image.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d757256..95c14e5 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -198,12 +198,12 @@ do_rootfs_finalize() {
-maxdepth 1 -name 'qemu-*-static' -type f -delete
mountpoint -q '${ROOTFSDIR}/isar-apt' && \
- umount -l ${ROOTFSDIR}/isar-apt
- rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt
+ umount -l ${ROOTFSDIR}/isar-apt && \
+ rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt
mountpoint -q '${ROOTFSDIR}/base-apt' && \
- umount -l ${ROOTFSDIR}/base-apt
- rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt
+ umount -l ${ROOTFSDIR}/base-apt && \
+ rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt
mountpoint -q '${ROOTFSDIR}/dev' && \
umount -l ${ROOTFSDIR}/dev
--
2.25.1
next prev parent reply other threads:[~2021-12-10 8:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 8:10 [PATCH 0/2] Fail on the first error inside sudo Anton Mikanovich
2021-12-10 8:10 ` Anton Mikanovich [this message]
2021-12-10 8:10 ` [PATCH 2/2] sudo: Fail on the first error Anton Mikanovich
2021-12-17 12:05 ` Henning Schild
2021-12-17 11:04 ` [PATCH 0/2] Fail on the first error inside sudo Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211210081054.225747-2-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox