diff --git a/local/scripts/test-iommu-qemu.sh b/local/scripts/test-iommu-qemu.sh index 6f4be88800..cc663f944f 100755 --- a/local/scripts/test-iommu-qemu.sh +++ b/local/scripts/test-iommu-qemu.sh @@ -70,7 +70,7 @@ for arg in "$@"; do done if [[ "$config" == "redbear-mini" ]]; then - config="redbear-minimal" + config="redbear-mini" fi firmware="$(find_uefi_firmware)" || { diff --git a/local/scripts/test-msix-qemu.sh b/local/scripts/test-msix-qemu.sh index 3a59f3dcf2..a93663351d 100644 --- a/local/scripts/test-msix-qemu.sh +++ b/local/scripts/test-msix-qemu.sh @@ -28,7 +28,7 @@ usage() { Usage: test-msix-qemu.sh [config] Boot a Red Bear image in QEMU and verify a live MSI-X path via virtio-net. -Defaults to redbear-mini (mapped to the in-tree redbear-minimal image). +Defaults to redbear-mini (mapped to the in-tree redbear-mini image). USAGE } @@ -43,7 +43,7 @@ done config="${1:-redbear-mini}" if [[ "$config" == "redbear-mini" ]]; then - config="redbear-minimal" + config="redbear-mini" fi arch="${ARCH:-$(uname -m)}" image="build/$arch/$config/harddrive.img" diff --git a/local/scripts/test-phase3-runtime-substrate.sh b/local/scripts/test-phase3-runtime-substrate.sh index 89cab7294d..121e34b554 100644 --- a/local/scripts/test-phase3-runtime-substrate.sh +++ b/local/scripts/test-phase3-runtime-substrate.sh @@ -143,7 +143,7 @@ usage() { cat <<'USAGE' Usage: ./local/scripts/test-phase3-runtime-substrate.sh --guest - ./local/scripts/test-phase3-runtime-substrate.sh --qemu [redbear-desktop] + ./local/scripts/test-phase3-runtime-substrate.sh --qemu [redbear-full] USAGE } @@ -152,7 +152,7 @@ case "${1:-}" in run_guest_checks ;; --qemu) - run_qemu_checks "${2:-redbear-desktop}" + run_qemu_checks "${2:-redbear-full}" ;; *) usage diff --git a/local/scripts/test-ps2-qemu.sh b/local/scripts/test-ps2-qemu.sh index 23d89c0bb1..2ed18a89fd 100755 --- a/local/scripts/test-ps2-qemu.sh +++ b/local/scripts/test-ps2-qemu.sh @@ -28,7 +28,7 @@ usage() { Usage: test-ps2-qemu.sh [--check] [config] [extra qemu args...] Launch or validate the PS/2 + serio path on a Red Bear image in QEMU. -Defaults to redbear-mini (mapped to the in-tree redbear-minimal image). +Defaults to redbear-mini (mapped to the in-tree redbear-mini image). USAGE } @@ -54,7 +54,7 @@ for arg in "$@"; do done if [[ "$config" == "redbear-mini" ]]; then - config="redbear-minimal" + config="redbear-mini" fi firmware="$(find_uefi_firmware)" || { diff --git a/local/scripts/test-timer-qemu.sh b/local/scripts/test-timer-qemu.sh index c4687b35b7..422d94cedf 100755 --- a/local/scripts/test-timer-qemu.sh +++ b/local/scripts/test-timer-qemu.sh @@ -28,7 +28,7 @@ usage() { Usage: test-timer-qemu.sh [--check] [config] [extra qemu args...] Launch or validate the startup timer path on a Red Bear image in QEMU. -Defaults to redbear-mini (mapped to the in-tree redbear-minimal image). +Defaults to redbear-mini (mapped to the in-tree redbear-mini image). USAGE } @@ -54,7 +54,7 @@ for arg in "$@"; do done if [[ "$config" == "redbear-mini" ]]; then - config="redbear-minimal" + config="redbear-mini" fi firmware="$(find_uefi_firmware)" || { diff --git a/local/scripts/test-usb-maturity-qemu.sh b/local/scripts/test-usb-maturity-qemu.sh index b4c15c0422..2fd2ef640e 100755 --- a/local/scripts/test-usb-maturity-qemu.sh +++ b/local/scripts/test-usb-maturity-qemu.sh @@ -10,7 +10,7 @@ usage() { Usage: test-usb-maturity-qemu.sh [config] Run the bounded USB maturity proof helpers in sequence. -Defaults to redbear-mini (mapped to the in-tree redbear-minimal image). +Defaults to redbear-mini (mapped to the in-tree redbear-mini image). Checks run: - xHCI interrupt mode @@ -32,7 +32,7 @@ done config="${1:-redbear-mini}" if [[ "$config" == "redbear-mini" ]]; then - config="redbear-minimal" + config="redbear-mini" fi echo ">>> Running xHCI interrupt proof" diff --git a/local/scripts/test-usb-qemu.sh b/local/scripts/test-usb-qemu.sh index e45d45a8b1..d3f7136670 100755 --- a/local/scripts/test-usb-qemu.sh +++ b/local/scripts/test-usb-qemu.sh @@ -50,7 +50,7 @@ usage() { Usage: test-usb-qemu.sh [--check] [config] Boot or validate the full USB stack on a Red Bear image in QEMU. -Defaults to redbear-mini (mapped to the in-tree redbear-minimal image). +Defaults to redbear-mini (mapped to the in-tree redbear-mini image). Checks performed: 1. xHCI controller initializes and reports interrupt mode @@ -80,7 +80,7 @@ for arg in "$@"; do done if [[ "$config" == "redbear-mini" ]]; then - config="redbear-minimal" + config="redbear-mini" fi firmware="$(find_uefi_firmware)" || { diff --git a/local/scripts/test-usb-storage-qemu.sh b/local/scripts/test-usb-storage-qemu.sh index 7d9102b17f..9f90f2b1a5 100644 --- a/local/scripts/test-usb-storage-qemu.sh +++ b/local/scripts/test-usb-storage-qemu.sh @@ -47,7 +47,7 @@ usage() { Usage: test-usb-storage-qemu.sh [config] Boot a Red Bear image with a USB storage device attached and verify usbscsid autospawn. -Defaults to redbear-desktop. +Defaults to redbear-full. USAGE } @@ -60,7 +60,7 @@ for arg in "$@"; do esac done -config="${1:-redbear-desktop}" +config="${1:-redbear-full}" arch="${ARCH:-$(uname -m)}" image="build/$arch/$config/harddrive.img" extra="build/$arch/$config/extra.img" diff --git a/local/scripts/test-vm-network-qemu.sh b/local/scripts/test-vm-network-qemu.sh index 6ee3202905..5539d6e45f 100644 --- a/local/scripts/test-vm-network-qemu.sh +++ b/local/scripts/test-vm-network-qemu.sh @@ -33,13 +33,13 @@ Usage: test-vm-network-qemu.sh [config] [extra qemu args...] Launch Red Bear OS in QEMU with the VirtIO network baseline enabled. Arguments: - config Optional config name (default: redbear-minimal) + config Optional config name (default: redbear-mini) extra qemu args Additional arguments appended to QEMUFLAGS Examples: ./local/scripts/test-vm-network-qemu.sh - ./local/scripts/test-vm-network-qemu.sh redbear-minimal -m 4G - QEMUFLAGS="-display sdl" ./local/scripts/test-vm-network-qemu.sh redbear-desktop + ./local/scripts/test-vm-network-qemu.sh redbear-mini -m 4G + QEMUFLAGS="-display sdl" ./local/scripts/test-vm-network-qemu.sh redbear-full In-guest validation commands: redbear-info --verbose @@ -58,14 +58,14 @@ for arg in "$@"; do esac done -CONFIG="redbear-minimal" +CONFIG="redbear-mini" if [[ $# -gt 0 ]] && [[ "$1" == redbear-* ]]; then CONFIG="$1" shift fi case "$CONFIG" in - redbear-minimal|redbear-desktop|redbear-full|redbear-kde|redbear-live) + redbear-mini|redbear-full|redbear-grub) ;; *) echo "ERROR: unsupported config '$CONFIG'" >&2 diff --git a/local/scripts/test-xhci-device-lifecycle-qemu.sh b/local/scripts/test-xhci-device-lifecycle-qemu.sh index b6bdced35d..be23c7cd85 100755 --- a/local/scripts/test-xhci-device-lifecycle-qemu.sh +++ b/local/scripts/test-xhci-device-lifecycle-qemu.sh @@ -47,7 +47,7 @@ usage() { Usage: test-xhci-device-lifecycle-qemu.sh [--check] [config] Boot a Red Bear image and exercise bounded xHCI attach/detach behavior via -QEMU monitor hotplug events. Defaults to redbear-mini (mapped to the in-tree redbear-minimal image). +QEMU monitor hotplug events. Defaults to redbear-mini (mapped to the in-tree redbear-mini image). USAGE } @@ -67,7 +67,7 @@ for arg in "$@"; do done if [[ "$config" == "redbear-mini" ]]; then - config="redbear-minimal" + config="redbear-mini" fi firmware="$(find_uefi_firmware)" || { diff --git a/local/scripts/test-xhci-irq-qemu.sh b/local/scripts/test-xhci-irq-qemu.sh index 4f6da3a1e2..f0ce49f715 100644 --- a/local/scripts/test-xhci-irq-qemu.sh +++ b/local/scripts/test-xhci-irq-qemu.sh @@ -28,7 +28,7 @@ usage() { Usage: test-xhci-irq-qemu.sh [--check] [config] Boot or validate xHCI interrupt-mode bring-up on a Red Bear image in QEMU. -Defaults to redbear-mini (mapped to the in-tree redbear-minimal image). +Defaults to redbear-mini (mapped to the in-tree redbear-mini image). USAGE } @@ -50,7 +50,7 @@ for arg in "$@"; do done if [[ "$config" == "redbear-mini" ]]; then - config="redbear-minimal" + config="redbear-mini" fi firmware="$(find_uefi_firmware)" || { diff --git a/local/scripts/validate-vm-network-baseline.sh b/local/scripts/validate-vm-network-baseline.sh index 00e67db3ee..356fe52e4f 100755 --- a/local/scripts/validate-vm-network-baseline.sh +++ b/local/scripts/validate-vm-network-baseline.sh @@ -36,18 +36,18 @@ require_pattern() { printf '=== Red Bear OS VM Network Baseline Validation ===\n' printf 'Root: %s\n\n' "$ROOT" -require_file "config/redbear-minimal.toml" +require_file "config/redbear-mini.toml" require_file "config/redbear-netctl.toml" require_file "recipes/core/base/source/init.d/00_pcid-spawner.service" require_file "recipes/core/base/source/init.d/10_smolnetd.service" require_file "recipes/core/base/source/init.d/10_dhcpd.service" require_file "recipes/core/base/recipe.toml" -require_pattern "config/redbear-minimal.toml" 'path = "/etc/netctl/active"' \ - 'redbear-minimal must install /etc/netctl/active' -require_pattern "config/redbear-minimal.toml" 'data = "wired-dhcp\\n"' \ - 'redbear-minimal must enable wired-dhcp by default' -pass 'redbear-minimal enables the wired-dhcp profile by default' +require_pattern "config/redbear-mini.toml" 'path = "/etc/netctl/active"' \ + 'redbear-mini must install /etc/netctl/active' +require_pattern "config/redbear-mini.toml" 'data = "wired-dhcp\\n"' \ + 'redbear-mini must enable wired-dhcp by default' +pass 'redbear-mini enables the wired-dhcp profile by default' require_pattern "config/redbear-netctl.toml" 'path = "/usr/lib/init.d/12_netctl.service"' \ 'redbear-netctl config must install the boot service' diff --git a/local/scripts/verify-overlay-integrity.sh b/local/scripts/verify-overlay-integrity.sh index 039a00cda1..8fd6e6e2a8 100755 --- a/local/scripts/verify-overlay-integrity.sh +++ b/local/scripts/verify-overlay-integrity.sh @@ -163,15 +163,15 @@ fi log "==> Checking config/redbear-*.toml files..." CRITICAL_CONFIGS=( "config/redbear-full.toml" - "config/redbear-live-full.toml" - "config/redbear-minimal.toml" - "config/redbear-live-minimal.toml" - "config/redbear-desktop.toml" + "config/redbear-mini.toml" + "config/redbear-grub.toml" + "config/redbear-grub-policy.toml" "config/redbear-device-services.toml" "config/redbear-legacy-base.toml" "config/redbear-legacy-desktop.toml" "config/redbear-netctl.toml" "config/redbear-greeter-services.toml" + "config/redbear-boot-stages.toml" ) MISSING_CONFIGS=0