live-bootstrap

commit: 55d3c36e09437d150a2a8876f25daaa3b9281148
parent 3305f2a41b13a1bac3e23ea0ddee069c7e3909c7
Author: Gábor Stefanik <netrolller.3d@gmail.com>
Date:   Sun, 17 Dec 2023 23:27:02 +0100

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.

Diffstat:
M
lib/generator.py
2
+-
M
rootfs.py
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git 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
@@ -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 += [