From 55d3c36e09437d150a2a8876f25daaa3b9281148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Stefanik?= Date: Sun, 17 Dec 2023 23:27:02 +0100 Subject: [PATCH] Move kernel-bootstrap source image out of the directory it's generated from This way, an incomplete version of the image itself won't get included in srcfs anymore. --- lib/generator.py | 2 +- rootfs.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/generator.py b/lib/generator.py index 1aec17f..bd532ad 100755 --- a/lib/generator.py +++ b/lib/generator.py @@ -92,7 +92,7 @@ class Generator(): shutil.copytree(self.repo_path, repo_dir) if kernel_bootstrap: - self.create_builder_hex0_disk_image(os.path.join(self.tmp_dir, 'disk.img'), target_size) + self.create_builder_hex0_disk_image(self.tmp_dir + '.img', target_size) if kernel_bootstrap and (self.external_sources or self.repo_path): self.tmpdir.umount_disk('external') diff --git a/rootfs.py b/rootfs.py index 172065b..d202cb2 100755 --- a/rootfs.py +++ b/rootfs.py @@ -244,7 +244,7 @@ print(shutil.which('chroot')) generator.prepare(kernel_bootstrap=True, target_size=size) image_path = os.path.join(args.tmpdir, os.path.relpath(generator.tmp_dir, args.tmpdir)) print("Please:") - print(f" 1. Take {image_path}/disk.img and write it to a boot drive and then boot it.") + print(f" 1. Take {image_path}.img and write it to a boot drive and then boot it.") else: if args.kernel: @@ -268,7 +268,7 @@ print(shutil.which('chroot')) '-m', str(args.qemu_ram) + 'M', '-smp', str(args.cores), '-no-reboot', - '-drive', 'file=' + os.path.join(generator.tmp_dir, 'disk.img') + ',format=raw' + '-drive', 'file=' + generator.tmp_dir + '.img' + ',format=raw' ] if tmpdir.get_disk("external") is not None: arg_list += [