commit: 31753cccb5186349d54ced93934c4cabbed2bcef
parent 959ea697423a753118fdb185f904007a32ff910c
Author: fosslinux <fosslinux@aussies.space>
Date: Wed, 10 Jan 2024 07:15:33 +0000
Merge pull request #386 from Googulator/debug-trap
Support interactive issue resolution prompts
Diffstat:
2 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/rootfs.py b/rootfs.py
@@ -34,6 +34,7 @@ def create_configuration_file(args):
config.write(f"JOBS={args.cores}\n")
config.write(f"SWAP_SIZE={args.swap}\n")
config.write(f"INTERNAL_CI={args.internal_ci or False}\n")
+ config.write(f"INTERACTIVE={args.interactive}\n")
config.write(f"BARE_METAL={args.bare_metal}\n")
if (args.bare_metal or args.qemu) and not args.kernel:
if args.repo or args.external_sources:
@@ -72,21 +73,24 @@ def main():
help="Force all files timestamps to be 0 unix time",
action="store_true")
parser.add_argument("--update-checksums",
- help="Update checksum files.",
+ help="Update checksum files",
action="store_true")
parser.add_argument("--external-sources",
- help="Download sources externally from live-bootstrap.",
+ help="Download sources externally from live-bootstrap",
action="store_true")
parser.add_argument("--build-kernels",
- help="Also build kernels in chroot and bwrap builds.",
+ help="Also build kernels in chroot and bwrap builds",
action="store_true")
parser.add_argument("--no-create-config",
help="Do not automatically create config file",
action="store_true")
+ parser.add_argument("-i", "--interactive",
+ help="Use interactive prompts to resolve issues during bootstrap",
+ action="store_true")
parser.add_argument("-r", "--repo",
- help="Path to prebuilt binary packages.", nargs=None)
+ help="Path to prebuilt binary packages", nargs=None)
parser.add_argument("--early-preseed",
- 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("-s", "--swap", help="Swap space to allocate in Linux",
default=0)
diff --git a/seed/script-generator.c b/seed/script-generator.c
@@ -417,7 +417,7 @@ void add_to_fiwix_filelist(char *filename) {
}
/* Script generator. */
-FILE *start_script(int id, int using_bash) {
+FILE *start_script(int id, int bash_build) {
/* Create the file /steps/$id.sh */
char *filename = calloc(MAX_STRING, sizeof(char));
strcpy(filename, "/steps/");
@@ -433,9 +433,19 @@ FILE *start_script(int id, int using_bash) {
exit(1);
}
- if (using_bash) {
+ if (bash_build) {
fputs("#!/bin/bash\n", out);
- fputs("set -e\n", out);
+ if (strcmp(get_var("INTERACTIVE"), "True") == 0) {
+ if (bash_build != 1) {
+ fputs("set -E\ntrap 'env PS1=\"[TRAP] \\w # \" bash -i' ERR\n", out);
+ } else {
+ fputs("set -E\ntrap 'bash -c '\"'\"'while true; do printf \""
+ "[TRAP - use Ctrl+D] $(pwd) # \"; $(cat); done'\"'\"'' ERR\n",
+ out);
+ }
+ } else {
+ fputs("set -e\n", out);
+ }
fputs("cd /steps\n", out);
fputs(". ./bootstrap.cfg\n", out);
fputs(". ./env\n", out);
@@ -460,8 +470,8 @@ FILE *start_script(int id, int using_bash) {
return out;
}
-void output_call_script(FILE *out, char *type, char *name, int using_bash, int source) {
- if (using_bash) {
+void output_call_script(FILE *out, char *type, char *name, int bash_build, int source) {
+ if (bash_build) {
if (source) {
fputs(". ", out);
} else {
@@ -479,8 +489,8 @@ void output_call_script(FILE *out, char *type, char *name, int using_bash, int s
fputs(".sh\n", out);
}
-void output_build(FILE *out, Directive *directive, int pass_no, int using_bash) {
- if (using_bash) {
+void output_build(FILE *out, Directive *directive, int pass_no, int bash_build) {
+ if (bash_build) {
fputs("build ", out);
fputs(directive->arg, out);
fputs(" pass", out);
@@ -520,9 +530,9 @@ void generate(Directive *directives) {
int counter = 0;
/* Initially, we use kaem, not bash. */
- int using_bash = 0;
+ int bash_build = 0;
- FILE *out = start_script(counter, using_bash);
+ FILE *out = start_script(counter, bash_build);
counter += 1;
Directive *directive;
@@ -538,24 +548,24 @@ void generate(Directive *directives) {
pass_no += 1;
}
}
- output_build(out, directive, pass_no, using_bash);
+ output_build(out, directive, pass_no, bash_build);
if (strncmp(directive->arg, "bash-", 5) == 0) {
- if (!using_bash) {
+ if (!bash_build) {
/*
* We are transitioning from bash to kaem, the point at which "early
* preseed" occurs. So generate the preseed jump script at this point.
*/
generate_preseed_jump(counter);
}
- using_bash = 1;
+ bash_build = 1;
/* Create call to new script. */
- output_call_script(out, "", int2str(counter, 10, 0), using_bash, 0);
+ output_call_script(out, "", int2str(counter, 10, 0), bash_build, 0);
fclose(out);
- out = start_script(counter, using_bash);
+ out = start_script(counter, bash_build);
counter += 1;
}
} else if (directive->type == TYPE_IMPROVE) {
- output_call_script(out, "improve", directive->arg, using_bash, 1);
+ output_call_script(out, "improve", directive->arg, bash_build, 1);
} else if (directive->type == TYPE_JUMP) {
/*
* Create /init to call new script.
@@ -563,7 +573,7 @@ void generate(Directive *directives) {
* moving that to /init at the appropriate time.
*/
filename = calloc(MAX_STRING, sizeof(char));
- if (using_bash) {
+ if (bash_build) {
fputs("mv /init /init.bak\n", out);
/* Move new init to /init. */
strcpy(filename, "/init.");
@@ -582,7 +592,7 @@ void generate(Directive *directives) {
fputs("chmod 755 /init\n", out);
}
- output_call_script(out, "jump", directive->arg, using_bash, 1);
+ output_call_script(out, "jump", directive->arg, bash_build, 1);
fclose(out);
/*
@@ -591,7 +601,7 @@ void generate(Directive *directives) {
*/
add_to_fiwix_filelist(filename);
- if (using_bash) {
+ if (bash_build) {
out = fopen(filename, "w");
if (out == NULL) {
fputs("Error opening /init\n", stderr);
@@ -606,12 +616,12 @@ void generate(Directive *directives) {
}
fputs("set -ex\n", out);
}
- output_call_script(out, "", int2str(counter, 10, 0), using_bash, 0);
+ output_call_script(out, "", int2str(counter, 10, 0), bash_build, 0);
fclose(out);
- out = start_script(counter, using_bash);
+ out = start_script(counter, bash_build);
counter += 1;
} else if (directive->type == TYPE_MAINT) {
- output_call_script(out, "maint", directive->arg, using_bash, 1);
+ output_call_script(out, "maint", directive->arg, bash_build, 1);
}
}
fclose(out);
