mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-23 19:46:31 +01:00
fix(payload): port raw external.img container
This commit is contained in:
parent
f824b6f9ac
commit
888347ea32
9 changed files with 785 additions and 40 deletions
19
rootfs.py
19
rootfs.py
|
|
@ -31,6 +31,8 @@ def create_configuration_file(args):
|
|||
"""
|
||||
config_path = os.path.join('steps', 'bootstrap.cfg')
|
||||
with open(config_path, "w", encoding="utf_8") as config:
|
||||
kernel_bootstrap = ((args.bare_metal or args.qemu) and not args.kernel)
|
||||
payload_required = kernel_bootstrap and args.external_sources and not args.repo
|
||||
config.write(f"ARCH={args.arch}\n")
|
||||
config.write(f"ARCH_DIR={stage0_arch_map.get(args.arch, args.arch)}\n")
|
||||
config.write(f"FORCE_TIMESTAMPS={args.force_timestamps}\n")
|
||||
|
|
@ -41,13 +43,11 @@ def create_configuration_file(args):
|
|||
config.write(f"FINAL_JOBS={args.cores}\n")
|
||||
config.write(f"INTERNAL_CI={args.internal_ci or False}\n")
|
||||
config.write(f"INTERACTIVE={args.interactive}\n")
|
||||
config.write(f"PAYLOAD_REQUIRED={payload_required}\n")
|
||||
config.write(f"QEMU={args.qemu}\n")
|
||||
config.write(f"BARE_METAL={args.bare_metal or (args.qemu and args.interactive)}\n")
|
||||
if (args.bare_metal or args.qemu) and not args.kernel:
|
||||
if args.repo or args.external_sources:
|
||||
config.write("DISK=sdb1\n")
|
||||
else:
|
||||
config.write("DISK=sda\n")
|
||||
if kernel_bootstrap:
|
||||
config.write("DISK=sdb1\n" if args.repo else "DISK=sda\n")
|
||||
config.write("KERNEL_BOOTSTRAP=True\n")
|
||||
else:
|
||||
config.write("DISK=sda1\n")
|
||||
|
|
@ -292,6 +292,15 @@ print(shutil.which('chroot'))
|
|||
path = os.path.join(args.target, os.path.relpath(generator.target_dir, args.target))
|
||||
print("Please:")
|
||||
print(f" 1. Take {path}.img and write it to a boot drive and then boot it.")
|
||||
external_disk = target.get_disk("external")
|
||||
if external_disk is not None:
|
||||
external_path = os.path.join(args.target, os.path.relpath(external_disk, args.target))
|
||||
if args.repo:
|
||||
print(" 2. Take " + f"{external_path} and attach it as a second disk "
|
||||
"(/dev/sdb preferred).")
|
||||
else:
|
||||
print(" 2. Take " + f"{external_path} and attach it as a second raw container "
|
||||
"disk (/dev/sdb preferred).")
|
||||
|
||||
else:
|
||||
if args.kernel:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue