From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7039983387261534208 X-Received: by 2002:a05:6402:84f:: with SMTP id b15mr31307934edz.342.1639123864816; Fri, 10 Dec 2021 00:11:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c98f:: with SMTP id c15ls83753edt.0.gmail; Fri, 10 Dec 2021 00:11:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjMfa9PQgs16S/jc5PlnLAQnOAoufxkSijZQvRwW+2q8qnm8lv7aLDV4IvmKsKu1uYwD7A X-Received: by 2002:a05:6402:84b:: with SMTP id b11mr34957884edz.69.1639123863885; Fri, 10 Dec 2021 00:11:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639123863; cv=none; d=google.com; s=arc-20160816; b=K7mpNH1EF1zUvRd6yyCrGjTcxwO5nR/dtJzvv5mGHiqDbUlLsapVb+6G65NFFdPsmq 8qMP6FeOB7cj9HhGD+o388FVAydOj9/fdDUkAh8Kl12oHO4ZAiUrSH06ciSXu/X4TwH2 OusfNQCRTS6w9SogJTvaNJr7xKJrt5cMfEycwelxORw5zhz91wl7rSdujCnj/en9i7Fx WxdyxWZs8moeLbi9HmUrsRZjNYt75BeNIsDhhvMDTTTdzMjOwpPfo81b0Wtrr5oSaUDN g2gM7SirxjLjnX95fN7gWrFNM/QA+fxmWma2UEXjvijZjkcNIkRo87exzgbJ/2uu/W4l +f1A== 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:date:subject:cc:to:from; bh=uTAkg+hFAhZuQpq4to/w6yeQ6a9WOD7/E8/9wEmt1Zs=; b=r23CcDslcZ0+T35/EbxTQzNurQBKsFRSj2URwZBq7BVRadbprPkUqM/1alEeD1/05F unZhQQt1c7sbr4TlJtRUisfq0QWLhBzVxINFZMQc4tfOmro+wC7fk3nBPuGcoR11BeE7 XIip42OFcii3AiHS2bulHWs6bUYSVrNePwh7lz4MBgTS3VJkwEqP9aS+TyOeFTwYZNHF LqYo4njULcQJvZ+uMkvhKNcJav1KaiK2rqlVME5rqKnzBMKpZMQCuXbmeArd555uL6YU r++XKSPg0ixCyfygOmXZgfX/ewxUR0dqM6xZ7/ntubwlFJlGT4e0eVwelOYLPdEffcqV tR8Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id fl21si182133ejc.0.2021.12.10.00.11.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Dec 2021 00:11:03 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-37-66-214-37.mgts.dynamic.pppoe.byfly.by [37.214.66.37] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1BA8B16v017623 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Dec 2021 09:11:03 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/2] rootfs: Execute rmdir only if needed Date: Fri, 10 Dec 2021 11:10:53 +0300 Message-Id: <20211210081054.225747-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211210081054.225747-1-amikan@ilbers.de> References: <20211210081054.225747-1-amikan@ilbers.de> 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: AN5X9vs44AxV We should not remove dirs if they are not unmounted or even exist. Signed-off-by: Anton Mikanovich --- 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