andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Gábor Stefanik 2023-12-17 23:27:02 +01:00
parent 3305f2a41b
commit 55d3c36e09
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/generator.py
View File

@ -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')

4
rootfs.py
View File

@ -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 += [