kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(rootfs): allow break-after checkpoints on first qemu kernel-bootstrap run

Browse source
This commit is contained in:
vxtls 2026-03-06 15:24:38 -05:00
parent a1881ad220
commit a1f3068047
1 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
rootfs.py
View file

@ -360,9 +360,10 @@ def main():
help="Skip early stages of live-bootstrap", nargs=None) help="Skip early stages of live-bootstrap", nargs=None)
parser.add_argument("--internal-ci", help="INTERNAL for github CI") parser.add_argument("--internal-ci", help="INTERNAL for github CI")
parser.add_argument("--internal-ci-break-after", parser.add_argument("--internal-ci-break-after",
help="With --stage0-image: insert a temporary " help="Insert a temporary jump: break after a build step "
"jump: break after a build step using " "using 'steps:<name>' or 'steps-guix:<name>' "
"'steps:<name>' or 'steps-guix:<name>'.") "for --stage0-image and fresh --qemu "
"kernel-bootstrap runs.")
parser.add_argument("-s", "--swap", help="Swap space to allocate in Linux", parser.add_argument("-s", "--swap", help="Swap space to allocate in Linux",
default=0) default=0)
@ -435,6 +436,17 @@ def main():
if not args.mirrors and not args.stage0_image: if not args.mirrors and not args.stage0_image:
raise ValueError("At least one mirror must be provided.") raise ValueError("At least one mirror must be provided.")
if args.internal_ci_break_after:
if not args.internal_ci:
raise ValueError("--internal-ci-break-after requires --internal-ci (e.g. pass2).")
break_scope, _ = parse_internal_ci_break_after(args.internal_ci_break_after)
if break_scope == "steps-guix" and not args.build_guix_also:
raise ValueError("--internal-ci-break-after steps-guix:* requires --build-guix-also.")
if not args.qemu:
raise ValueError("--internal-ci-break-after currently requires --qemu.")
if args.kernel:
raise ValueError("--internal-ci-break-after is only supported in kernel-bootstrap mode (without --kernel).")
if args.stage0_image: if args.stage0_image:
if not args.qemu: if not args.qemu:
raise ValueError("--stage0-image can only be used with --qemu.") raise ValueError("--stage0-image can only be used with --qemu.")
@ -443,12 +455,6 @@ def main():
if not os.path.isfile(args.stage0_image): if not os.path.isfile(args.stage0_image):
raise ValueError(f"Stage0 image does not exist: {args.stage0_image}") raise ValueError(f"Stage0 image does not exist: {args.stage0_image}")
args.stage0_image = os.path.abspath(args.stage0_image) args.stage0_image = os.path.abspath(args.stage0_image)
if args.internal_ci_break_after:
if not args.internal_ci:
raise ValueError("--internal-ci-break-after requires --internal-ci (e.g. pass1).")
break_scope, _ = parse_internal_ci_break_after(args.internal_ci_break_after)
if break_scope == "steps-guix" and not args.build_guix_also:
raise ValueError("--internal-ci-break-after steps-guix:* requires --build-guix-also.")
# Set constant umask # Set constant umask
os.umask(0o022) os.umask(0o022)
@ -619,6 +625,16 @@ print(shutil.which('chroot'))
'root=/dev/sda1 rootfstype=ext3 init=/init rw'] 'root=/dev/sda1 rootfstype=ext3 init=/init rw']
else: else:
generator.prepare(target, kernel_bootstrap=True, target_size=size) generator.prepare(target, kernel_bootstrap=True, target_size=size)
if args.internal_ci_break_after:
# Allow first-run qemu kernel-bootstrap to inject the same scoped breakpoints
# supported by --stage0-image resume runs.
update_stage0_image(
generator.target_dir + '.img',
build_guix_also=args.build_guix_also,
mirrors=args.mirrors,
internal_ci=args.internal_ci,
internal_ci_break_after=args.internal_ci_break_after,
)
arg_list = [ arg_list = [
'-enable-kvm', '-enable-kvm',
'-m', str(args.qemu_ram) + 'M', '-m', str(args.qemu_ram) + 'M',