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 B6AF015808B for ; Sat, 5 Oct 2024 21:41:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C65ACE29AD; Sat, 5 Oct 2024 21:41:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 AE379E29AD for ; Sat, 5 Oct 2024 21:41:49 +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 E7A95343164 for ; Sat, 5 Oct 2024 21:41:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04E8C11DF for ; Sat, 5 Oct 2024 21:41:47 +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: <1728164471.e9acffc5a3b98f2db19b080eb14ef92bf0e11735.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/diskimage_stage2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: e9acffc5a3b98f2db19b080eb14ef92bf0e11735 X-VCS-Branch: dilfridge/qcow2 Date: Sat, 5 Oct 2024 21:41:47 +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: 5274fe2f-b35e-4aea-a8a1-488af3cff96e X-Archives-Hash: 59b98cfd2b2edd5fe9a2e8fffc63aa96 commit: e9acffc5a3b98f2db19b080eb14ef92bf0e11735 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Oct 5 21:41:11 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Oct 5 21:41:11 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e9acffc5 We don't need target_setup since a disk image has no internal squashfs etc bla Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/targets/diskimage_stage2.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/catalyst/targets/diskimage_stage2.py b/catalyst/targets/diskimage_stage2.py index e0e8aeaf..2036811b 100644 --- a/catalyst/targets/diskimage_stage2.py +++ b/catalyst/targets/diskimage_stage2.py @@ -89,8 +89,7 @@ class diskimage_stage2(StageBase): self.build_sequence.extend([ self.bootloader, self.preclean, - self.diskimage_update, # what does this do? - # we don't need root_overlay (or any sort of overlay) + self.diskimage_update, self.fsscript, self.rcupdate, self.unmerge, @@ -99,7 +98,6 @@ class diskimage_stage2(StageBase): self.remove, self.empty, self.clean, - self.target_setup, # what does this do? - self.create_qcow2, # import all files into qcow2 + self.create_qcow2, ]) self.set_completion_action_sequences()