commit: 22aac14f81203111cd567599ab959d384429a943
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 5 21:21:18 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 21:21:18 2024 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=22aac14f
Slightly more sane action sequence
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
catalyst/targets/diskimage_stage2.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/catalyst/targets/diskimage_stage2.py
b/catalyst/targets/diskimage_stage2.py
index e665fb42..e0e8aeaf 100644
--- a/catalyst/targets/diskimage_stage2.py
+++ b/catalyst/targets/diskimage_stage2.py
@@ -87,12 +87,10 @@ class diskimage_stage2(StageBase):
])
if "fetch" not in self.settings["options"]:
self.build_sequence.extend([
- self.create_diskimage, # create image file
- self.open_diskimage, # loopback or nbd
- self.make_filesystems, # partition, make filesystems
- self.move_into_image, # move files in
- self.bootloader, # install bootloader (efi
grub?)
+ self.bootloader,
self.preclean,
+ self.diskimage_update, # what does this do?
+ # we don't need root_overlay (or any sort of overlay)
self.fsscript,
self.rcupdate,
self.unmerge,
@@ -101,7 +99,7 @@ class diskimage_stage2(StageBase):
self.remove,
self.empty,
self.clean,
- self.target_setup,
- self.close_diskimage, # unmount, unmap
+ self.target_setup, # what does this do?
+ self.create_qcow2, # import all files into qcow2
])
self.set_completion_action_sequences()
