diff options
| author | salmonik <salmonik@tuta.io> | 2026-08-27 18:35:59 +0200 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-08-27 18:35:59 +0200 |
| commit | acd0fe1bc38746f36fff24a7497041e5c5010977 (patch) | |
| tree | 5db6335b732409c7f180f8514196c52a7b88f434 /scripts/boot-image.sh | |
| parent | GUI: fire-and-forget spawn for /bin/gui binaries (diff) | |
| download | rs-dos-acd0fe1bc38746f36fff24a7497041e5c5010977.tar.gz rs-dos-acd0fe1bc38746f36fff24a7497041e5c5010977.zip | |
scripts: migrate all QEMU/test scripts to single system image
boot.sh: replace esp/ + DISK_IMG with single SYSTEM_IMG on ide.0
(hooks into mksystem.sh --force for auto-staging).
boot-image.sh: delegate to mksystem.sh --chain (build-image.sh deleted).
build-image-release.sh: delegate to mksystem.sh --chain --gpt.
qemu.sh: flexible launcher uses SYSTEM_IMG; --chain flag for
full-chain build.
test-disk.sh: drop ESP_DIR (mksystem.sh stages everything).
test-fault.sh: boot system.img on ide.0 + CRASHLOG stick on ide.1;
replace deleted mkdisk.sh with inline mkfs.fat.
test-gfx.sh: system.img on ide.0, stage via mksystem.sh.
test-mouse.sh: system.img on ide.0, stage via mksystem.sh.
test-msg.sh: system.img on ide.0, stage via mksystem.sh.
Makefile: remove stale build-image.sh/mkdisk.sh references from help;
image target delegates to mksystem.sh --chain.
All scripts syntax-checked (bash -n). build-image.sh and mkdisk.sh
no longer referenced anywhere.
Diffstat (limited to '')
| -rwxr-xr-x | scripts/boot-image.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/boot-image.sh b/scripts/boot-image.sh index e8c093c..f70dcd4 100755 --- a/scripts/boot-image.sh +++ b/scripts/boot-image.sh | |||
| @@ -20,11 +20,10 @@ | |||
| 20 | set -euo pipefail | 20 | set -euo pipefail |
| 21 | 21 | ||
| 22 | SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" | 22 | SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" |
| 23 | PROJECT_DIR="$(dirname "$SCRIPT_DIR")" | 23 | PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" |
| 24 | |||
| 25 | cd "$PROJECT_DIR" | 24 | cd "$PROJECT_DIR" |
| 26 | 25 | ||
| 27 | IMAGE="rs-dos.img" | 26 | IMAGE="${1:-rs-dos.img}" |
| 28 | 27 | ||
| 29 | # ---- config ---- | 28 | # ---- config ---- |
| 30 | OVMF="${OVMF:-/usr/share/edk2/x64/OVMF.4m.fd}" | 29 | OVMF="${OVMF:-/usr/share/edk2/x64/OVMF.4m.fd}" |
| @@ -40,7 +39,7 @@ parse_boot_args "$@" | |||
| 40 | # ---- build image if missing ---- | 39 | # ---- build image if missing ---- |
| 41 | if [ ! -f "$IMAGE" ]; then | 40 | if [ ! -f "$IMAGE" ]; then |
| 42 | echo "Image not found, building..." | 41 | echo "Image not found, building..." |
| 43 | "$SCRIPT_DIR/build-image.sh" | 42 | "$SCRIPT_DIR/mksystem.sh" --chain --gpt "$IMAGE" |
| 44 | fi | 43 | fi |
| 45 | 44 | ||
| 46 | # ---- boot ---- | 45 | # ---- boot ---- |
