summaryrefslogtreecommitdiffstats
path: root/scripts/boot-image.sh
diff options
context:
space:
mode:
authorsalmonik <salmonik@tuta.io>2026-11-01 15:53:29 +0100
committersalmonik <salmonik@tuta.io>2026-11-01 15:53:29 +0100
commit7958276c9f0d230053520ba20f2a00f5ecda18e4 (patch)
tree596f5f71ad597ed951bae98de818cb37f171a18d /scripts/boot-image.sh
parentfs: /bin alias for the system volume (diff)
downloadrs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.tar.gz
rs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.zip
scripts: rebuild the dev loop around build.sh/run.sh
`make` did not parse at all (missing separator at line 139), so every make target was dead. The folder also carried three overlapping launchers (boot.sh, qemu.sh, boot-image.sh) plus a fourth partial one in the Makefile, `cargo build --package rsdos` copy-pasted eight times, the QEMU invocation copy-pasted per script, and the test helpers (fail/wait_log/wait_qemu_exit/qemu_hmp) duplicated in five tests. New layout: - scripts/lib.sh: single config (image, OVMF, mem/smp), the one cargo invocation (build_all), the one QEMU shape (qemu_args), and the test harness (test_boot, wait_log, wait_qemu_exit, qemu_hmp, sendkeys) - scripts/build.sh: kernel + every bins/* in one pass - scripts/mksystem.sh: freshness-aware image build that now stages every bins/*.efi into /bin/cli|gui (they were never copied before) - scripts/run.sh: build + stage + boot in one command; --headless, --debug (GDB stub), --monitor (HMP socket), --fresh, --mem/--smp/ --bios/--image; on Wayland it auto-selects XWayland plus grab-on-hover so the mouse can be captured (Ctrl+Alt+G toggles) - scripts/tests/: the five automated tests on the shared harness - deleted: boot.sh, qemu.sh, boot-image.sh, lib-boot-args.sh, build-image-release.sh, build-bootloader.sh (rsboot chain dropped) The Makefile is now a thin wrapper: make run, make test, make system, make inspect, make help. Two-command flow: ./scripts/build.sh then ./scripts/run.sh (run.sh alone also works). Stale test assumptions fixed so the suite is green again: test-gfx waited for "gfx: check" while the shell prints "gfx check: PASS"; test-mouse/test-msg hardcoded msgrecv = task 3 (wm-input took slot 3 — ids are parsed from the log now); the queue-full probe targeted task 0, whose exec pump drains its own queue as completion codes (moved to the cursor task, which never recvs). Verified in QEMU: make test -> test-disk, test-gfx, test-mouse, test-msg, test-fault all PASS.
Diffstat (limited to 'scripts/boot-image.sh')
-rwxr-xr-xscripts/boot-image.sh65
1 files changed, 0 insertions, 65 deletions
diff --git a/scripts/boot-image.sh b/scripts/boot-image.sh
deleted file mode 100755
index f70dcd4..0000000
--- a/scripts/boot-image.sh
+++ /dev/null
@@ -1,65 +0,0 @@
1#!/usr/bin/env bash
2#
3# scripts/boot-image.sh — boot rs-dos full chain disk image in QEMU
4#
5# Builds the image first if needed, then boots with UEFI firmware through
6# the real boot chain: firmware → rsboot → rsnix kernel.
7#
8# Usage:
9# ./scripts/boot-image.sh [--gui] [--debug] [--mem 512M] [--smp 2]
10#
11# Keybindings:
12# Ctrl-A X — quit
13# Ctrl-A C — QEMU monitor
14#
15# Environment:
16# OVMF path to OVMF firmware (default: /usr/share/edk2/x64/OVMF.4m.fd)
17# MEM memory size (default: 256M)
18# SMP CPU count (default: 1)
19#
20set -euo pipefail
21
22SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
23PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
24cd "$PROJECT_DIR"
25
26IMAGE="${1:-rs-dos.img}"
27
28# ---- config ----
29OVMF="${OVMF:-/usr/share/edk2/x64/OVMF.4m.fd}"
30MEM="${MEM:-256M}"
31SMP="${SMP:-1}"
32GUI=""
33DEBUG=""
34
35# ---- args ----
36source "$SCRIPT_DIR/lib-boot-args.sh"
37parse_boot_args "$@"
38
39# ---- build image if missing ----
40if [ ! -f "$IMAGE" ]; then
41 echo "Image not found, building..."
42 "$SCRIPT_DIR/mksystem.sh" --chain --gpt "$IMAGE"
43fi
44
45# ---- boot ----
46echo ""
47echo "=== Booting (full chain: firmware → rsboot → rsnix) ==="
48echo " image: $IMAGE"
49echo " ovmf: $OVMF"
50echo " mem: $MEM smp: $SMP"
51echo " gui: $([ -n "$GUI" ] && echo yes || echo no)"
52echo " gdb: $([ -n "$DEBUG" ] && echo ':1234' || echo off)"
53echo ""
54
55exec qemu-system-x86_64 \
56 -bios "$OVMF" \
57 -drive file="$IMAGE",format=raw,if=none,id=hd \
58 -device ide-hd,drive=hd \
59 -serial stdio \
60 -m "$MEM" \
61 -machine q35 \
62 -cpu qemu64 \
63 -no-reboot \
64 -smp "$SMP" \
65 $GUI $DEBUG