From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 7306E5A0284 for ; Thu, 30 Nov 2023 03:02:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1701309746; bh=3OTuybDY1RfnyLAT1IGb0Sd+x3IzkcOAg8HEq5U/4Gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WAZIWPjZUH1GHaawE1w7A9gDZjx6BZt6u1wJsxT3K17D2PyRx3HkGLLzk7KBu0Z6r 9PS1hZXwY0cteobsYkagj/AK+PyJe42mXZLN+UCwQ4rBQ2XIgyr51jh1Rz8NK1uIWs zL0Hggjac5L9Udb1Sc+aYuCsPPQzEUSaiHr/CE7U= Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Sgfb62M69z4xWL; Thu, 30 Nov 2023 13:02:26 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 13/16] test: Avoid hitting guestfish command length limits Date: Thu, 30 Nov 2023 13:02:19 +1100 Message-ID: <20231130020222.4056647-14-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231130020222.4056647-1-david@gibson.dropbear.id.au> References: <20231130020222.4056647-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: A3SIVTNDFFUGKT33TFXGCNX7MFJUDQB7 X-Message-ID-Hash: A3SIVTNDFFUGKT33TFXGCNX7MFJUDQB7 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: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: In test/prepare-distro-img.sh we use guestfish to tweak our distro guest images to be suitable. Part of this is using a 'copy-in' directive to copy in the source files for passt itself. Currently we copy in all the files with a single 'copy-in', since it allows listing multiple files. However it turns out that the number of arguments it can accept is fairly limited and our current list of files is already very close to that limit. Instead, expand our list of files to one copy-in per file, avoiding that limitation. This isn't much slower, because all the commands still run in a single invocation of guestfish itself. Signed-off-by: David Gibson --- test/prepare-distro-img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/prepare-distro-img.sh b/test/prepare-distro-img.sh index 46bc126..0d967c9 100755 --- a/test/prepare-distro-img.sh +++ b/test/prepare-distro-img.sh @@ -14,5 +14,5 @@ rm-f /etc/init.d/cloud-config rm-f /etc/init.d/cloud-final rm-f /etc/init.d/cloud-init rm-f /etc/init.d/cloud-init-local -copy-in $PASST_FILES /root/ +$(for f in $PASST_FILES; do echo copy-in $f /root; done) EOF -- 2.43.0