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

Account for int and NoneType in string concatenations.

This commit is contained in:
rick-masters 2024-01-10 18:03:50 +00:00
parent 5b7175de3e
commit 82235e5bd0
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/generator.py
View File

@ -73,7 +73,7 @@ class Generator():
self.target_dir = os.path.join(self.target_dir, 'disk')
target.add_disk("disk",
filesystem="ext3",
size=(target_size + "M") if target_size else "16G",
size=(str(target_size) + "M") if target_size else "16G",
bootable=True)
target.mount_disk("disk", "disk")
self.external_dir = os.path.join(self.target_dir, 'external')

15
rootfs.py
View File

@ -245,17 +245,24 @@ print(shutil.which('chroot'))
if args.kernel:
generator.prepare(target, using_kernel=True, target_size=size)
run(args.qemu_cmd,
arg_list = [
'-enable-kvm',
'-m', str(args.qemu_ram) + 'M',
'-smp', str(args.cores),
'-no-reboot',
'-drive', 'file=' + target.get_disk("disk") + ',format=raw',
'-drive', 'file=' + target.get_disk("external") + ',format=raw',
'-drive', 'file=' + target.get_disk("disk") + ',format=raw'
]
if target.get_disk("external") is not None:
arg_list += [
'-drive', 'file=' + target.get_disk("external") + ',format=raw',
]
arg_list += [
'-nic', 'user,ipv6=off,model=e1000',
'-kernel', args.kernel,
'-nographic',
'-append', 'console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw')
'-append', 'console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw'
]
run(args.qemu_cmd, *arg_list)
else:
generator.prepare(target, kernel_bootstrap=True, target_size=size)
arg_list = [