From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DD06158046 for ; Fri, 11 Oct 2024 22:07:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C3E6E29B0; Fri, 11 Oct 2024 22:07:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 611D0E29B0 for ; Fri, 11 Oct 2024 22:07:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67F773431E5 for ; Fri, 11 Oct 2024 22:07:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81DA81BCF for ; Fri, 11 Oct 2024 22:07:44 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1728681001.bbd1c0850016b470e25728461325168091507d82.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/create-qcow2.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: bbd1c0850016b470e25728461325168091507d82 X-VCS-Branch: dilfridge/qcow2 Date: Fri, 11 Oct 2024 22:07:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c0678bd-4424-46c3-a8fd-c3ae24ff8906 X-Archives-Hash: d8c51dfc2945999c3edcb9f837b1e171 commit: bbd1c0850016b470e25728461325168091507d82 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Oct 11 21:10:01 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Oct 11 21:10:01 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bbd1c085 Copy correct content into image Signed-off-by: Andreas K. Hüttel gentoo.org> targets/support/create-qcow2.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/create-qcow2.sh b/targets/support/create-qcow2.sh index 9510cabb..2d7a046a 100755 --- a/targets/support/create-qcow2.sh +++ b/targets/support/create-qcow2.sh @@ -73,8 +73,8 @@ mount ${mypartroot} "${mymountpoint}" || die "Could not mount root partition" mkdir -p "${mymountpoint}"/boot || die "Could not create boot mount point" mount ${mypartefi} "${mymountpoint}/boot" || die "Could not mount boot partition" -# copy contents in - do we need extra preserve steps? rsync? tar? -cp -a "${clst_target_path}"/* "${mymountpoint}/" || die "Could not copy content into mounted image" +# copy contents in; the source is the stage dir and not any "iso content" +cp -a "${clst_stage_path}"/* "${mymountpoint}/" || die "Could not copy content into mounted image" # at this point we have a working system