fix stale config names in 13 test/validation scripts
redbear-minimal -> redbear-mini (config renamed, old name never existed as file) redbear-desktop -> redbear-full (desktop is the full target) redbear-live-full/redbear-live-minimal -> removed (never existed) Also fix verify-overlay-integrity.sh critical config list: - Remove 4 nonexistent configs (redbear-live-full, redbear-live-minimal, redbear-desktop) - Add 2 missing configs (redbear-grub, redbear-grub-policy, redbear-boot-stages)
This commit is contained in:
@@ -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)" || {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)" || {
|
||||
|
||||
@@ -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)" || {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)" || {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)" || {
|
||||
|
||||
@@ -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)" || {
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user