From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	by passt.top (Postfix) with ESMTPS id E568F5A026D
	for <passt-dev@passt.top>; Fri, 26 Apr 2024 04:01:14 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=gibson.dropbear.id.au; s=202312; t=1714096870;
	bh=3WzRdnkbIj5xOCETpezznvf42R+WZldlYBpvxerIxsI=;
	h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
	b=HekrgjNmZodlQHTLWp3PPii5i2839narUYy1l1GSOaKJH+UQERV6aQ9HpF+KQBWlz
	 ORNSg+2GqjD2gMvEznSmon1bEO0U4YqyH0N5iXDgyJ80nqfa8Mh+Ue6lWiOwImUZpy
	 cCBuw6Q1atoE2O0k1qCFNXG1HUViNXgomaC4y2klndFAWt1KwfNw4NUUCQOykx3o5M
	 8Fj1W9IgWtt9AXon8FGFXIp4ToX0yoFpq3raRtqzJwuJeciqnPdUA6CSo/CVib46tL
	 jZzTY+mgoY3B2pWUj/quZH/c+AVWoEPetEtoOGRlTsMIjEmVCMcQEbar033DnZmvnY
	 ilPXB2RkX5YjQ==
Received: by gandalf.ozlabs.org (Postfix, from userid 1007)
	id 4VQbYL5qXqz4x12; Fri, 26 Apr 2024 12:01:10 +1000 (AEST)
From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Subject: [PATCH v2 1/4] ${wd} is always set, no need to test for it
Date: Fri, 26 Apr 2024 12:01:05 +1000
Message-ID: <20240426020108.1522375-2-david@gibson.dropbear.id.au>
X-Mailer: git-send-email 2.44.0
In-Reply-To: <20240426020108.1522375-1-david@gibson.dropbear.id.au>
References: <20240426020108.1522375-1-david@gibson.dropbear.id.au>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Message-ID-Hash: I5KQT5GDPZFPYNMONGDLDUZEBOXDZKCK
X-Message-ID-Hash: I5KQT5GDPZFPYNMONGDLDUZEBOXDZKCK
X-MailFrom: dgibson@gandalf.ozlabs.org
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header
CC: passt-dev@passt.top, lvivier@redhat.com, David Gibson <david@gibson.dropbear.id.au>
X-Mailman-Version: 3.3.8
Precedence: list
List-Id: Development discussion and patches for passt <passt-dev.passt.top>
Archived-At: <https://archives.passt.top/passt-dev/20240426020108.1522375-2-david@gibson.dropbear.id.au/>
Archived-At: <https://passt.top/hyperkitty/list/passt-dev@passt.top/message/I5KQT5GDPZFPYNMONGDLDUZEBOXDZKCK/>
List-Archive: <https://archives.passt.top/passt-dev/>
List-Archive: <https://passt.top/hyperkitty/list/passt-dev@passt.top/>
List-Help: <mailto:passt-dev-request@passt.top?subject=help>
List-Owner: <mailto:passt-dev-owner@passt.top>
List-Post: <mailto:passt-dev@passt.top>
List-Subscribe: <mailto:passt-dev-join@passt.top>
List-Unsubscribe: <mailto:passt-dev-leave@passt.top>

We unconditionally set ${wd} to a temporary directory, but there are some
places where we test if it is empty.  This appears to be stale code from
some earlier version, so simply remove it.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 mbuto | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mbuto b/mbuto
index 0609e7e..a6f80ab 100755
--- a/mbuto
+++ b/mbuto
@@ -369,7 +369,7 @@ cmd_check() {
 # cleanup() - Remove left-overs on exit, used from trap
 cleanup() {
 	[ -n "${ARCHIVEMOUNT}" ] && "${UMOUNT}" "${wd}" 2>/dev/null
-	[ -n "${wd}" ] && "${RM}" -rf "${wd}"
+	"${RM}" -rf "${wd}"
 	[ -n "${pkg_tmp}" ] && "${RM}" -f "${pkg_tmp}"
 	[ -n "${compress_test1}" ] && "${RM}" -f "${compress_test1}"
 	[ -n "${compress_test2}" ] && "${RM}" -f "${compress_test2}"
@@ -1044,7 +1044,6 @@ build() {
 # add() - Add contents to existing image
 # $1:	Item to be added
 add() {
-	[ -z "${wd}" ] && cpio_init
 	kmod_init
 
 	[ -e "${1}" ] && __path="${1}" || __path=$(command -v "${1}") || :
-- 
2.44.0