|
|
|
|
@@ -566,6 +566,42 @@ validate_iso_live_boot_entries() {
|
|
|
|
|
echo "=== live boot validation OK ==="
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
validate_iso_grub_theme_assets() {
|
|
|
|
|
iso_path="$1"
|
|
|
|
|
echo "=== validating GRUB theme assets in ISO ==="
|
|
|
|
|
|
|
|
|
|
[ -f "$iso_path" ] || {
|
|
|
|
|
echo "ERROR: ISO not found for GRUB theme validation: $iso_path" >&2
|
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
require_iso_reader "$iso_path" >/dev/null 2>&1 || {
|
|
|
|
|
echo "ERROR: ISO reader unavailable for GRUB theme validation" >&2
|
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
iso_files="$(mktemp)"
|
|
|
|
|
list_iso_files "$iso_path" > "$iso_files" || {
|
|
|
|
|
echo "ERROR: failed to list ISO files for GRUB theme validation" >&2
|
|
|
|
|
rm -f "$iso_files"
|
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for required in \
|
|
|
|
|
boot/grub/config.cfg \
|
|
|
|
|
boot/grub/theme.cfg \
|
|
|
|
|
boot/grub/live-theme/theme.txt \
|
|
|
|
|
boot/grub/live-theme/bee-logo.tga; do
|
|
|
|
|
grep -q "^${required}$" "$iso_files" || {
|
|
|
|
|
echo "ERROR: missing GRUB theme asset in ISO: ${required}" >&2
|
|
|
|
|
rm -f "$iso_files"
|
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
rm -f "$iso_files"
|
|
|
|
|
echo "=== GRUB theme validation OK ==="
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
validate_iso_nvidia_runtime() {
|
|
|
|
|
iso_path="$1"
|
|
|
|
|
[ "$BEE_GPU_VENDOR" = "nvidia" ] || return 0
|
|
|
|
|
@@ -698,16 +734,6 @@ write_canonical_grub_cfg() {
|
|
|
|
|
cat > "$cfg" <<EOF
|
|
|
|
|
source /boot/grub/config.cfg
|
|
|
|
|
|
|
|
|
|
echo ""
|
|
|
|
|
echo " ███████╗ █████╗ ███████╗██╗ ██╗ ██████╗ ███████╗███████╗"
|
|
|
|
|
echo " ██╔════╝██╔══██╗██╔════╝╚██╗ ██╔╝ ██╔══██╗██╔════╝██╔════╝"
|
|
|
|
|
echo " █████╗ ███████║███████╗ ╚████╔╝ █████╗██████╔╝█████╗ █████╗"
|
|
|
|
|
echo " ██╔══╝ ██╔══██║╚════██║ ╚██╔╝ ╚════╝██╔══██╗██╔══╝ ██╔══╝"
|
|
|
|
|
echo " ███████╗██║ ██║███████║ ██║ ██████╔╝███████╗███████╗"
|
|
|
|
|
echo " ╚══════╝╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═════╝ ╚══════╝╚══════╝"
|
|
|
|
|
echo " Hardware Audit LiveCD"
|
|
|
|
|
echo ""
|
|
|
|
|
|
|
|
|
|
menuentry "EASY-BEE" {
|
|
|
|
|
linux ${kernel} ${append_live} bee.display=kms bee.nvidia.mode=normal pci=realloc net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup
|
|
|
|
|
initrd ${initrd}
|
|
|
|
|
@@ -746,13 +772,13 @@ write_canonical_isolinux_cfg() {
|
|
|
|
|
cat > "$cfg" <<EOF
|
|
|
|
|
label live-@FLAVOUR@-normal
|
|
|
|
|
menu label ^EASY-BEE
|
|
|
|
|
menu default
|
|
|
|
|
linux ${kernel}
|
|
|
|
|
initrd ${initrd}
|
|
|
|
|
append ${append_live} nomodeset bee.nvidia.mode=normal net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup
|
|
|
|
|
|
|
|
|
|
label live-@FLAVOUR@-toram
|
|
|
|
|
menu label EASY-BEE (^load to RAM)
|
|
|
|
|
menu default
|
|
|
|
|
linux ${kernel}
|
|
|
|
|
initrd ${initrd}
|
|
|
|
|
append ${append_live} toram nomodeset bee.nvidia.mode=normal net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup
|
|
|
|
|
@@ -1561,6 +1587,7 @@ if ! needs_full_build; then
|
|
|
|
|
fast_path_rebuild_iso
|
|
|
|
|
ISO_RAW="${LB_DIR}/live-image-amd64.hybrid.iso"
|
|
|
|
|
validate_iso_live_boot_entries "$ISO_RAW"
|
|
|
|
|
validate_iso_grub_theme_assets "$ISO_RAW"
|
|
|
|
|
validate_iso_nvidia_runtime "$ISO_RAW"
|
|
|
|
|
cp "$ISO_RAW" "$ISO_OUT"
|
|
|
|
|
echo ""
|
|
|
|
|
@@ -1615,6 +1642,7 @@ if [ -f "$ISO_RAW" ]; then
|
|
|
|
|
fi
|
|
|
|
|
validate_iso_memtest "$ISO_RAW"
|
|
|
|
|
validate_iso_live_boot_entries "$ISO_RAW"
|
|
|
|
|
validate_iso_grub_theme_assets "$ISO_RAW"
|
|
|
|
|
validate_iso_nvidia_runtime "$ISO_RAW"
|
|
|
|
|
cp "$ISO_RAW" "$ISO_OUT"
|
|
|
|
|
touch "${FULL_BUILD_MARKER}"
|
|
|
|
|
|