diff --git a/scripts/iso/build-felhom-iso.sh b/scripts/iso/build-felhom-iso.sh index 5a10340..411ecd2 100755 --- a/scripts/iso/build-felhom-iso.sh +++ b/scripts/iso/build-felhom-iso.sh @@ -433,9 +433,14 @@ if $BRAND || [[ "$LOADER" == "mkimage" ]]; then cp "$HERE/grub/grub.cfg.tmpl" "$HERE/grub/felhom-theme.txt" \ "$HERE/grub/generate-grub-background.sh" "$WORK/brand/" cp "$BRAND_IMAGE" "$WORK/brand/card.png" + $RELEASE && cp "$HERE/grub/grub-release.cfg.tmpl" "$WORK/brand/" fi + REPACK_MENU=single; $RELEASE && REPACK_MENU=release + REPACK_DEB="" + if [[ -n "${RELEASE_DEB:-}" ]]; then cp "$RELEASE_DEB" "$WORK/felhom.deb"; REPACK_DEB=/work/felhom.deb; fi docker run --rm -v "$WORK":/work \ -e FELHOM_LOADER="$LOADER" -e FELHOM_BRAND="$($BRAND && echo 1 || echo 0)" \ + -e FELHOM_MENU="$REPACK_MENU" -e FELHOM_DEB="$REPACK_DEB" \ "$IMAGE" bash /work/iso-repack.sh 2>&1 | sed 's/^/ [repack] /' [[ -f "$WORK/final.iso" ]] || die "repack produced no output (see [repack] log above)" GRUB_VERSION="$(cat "$WORK/grub-version.txt" 2>/dev/null || echo unknown)" diff --git a/scripts/iso/iso-repack.sh b/scripts/iso/iso-repack.sh index 198943c..5007278 100755 --- a/scripts/iso/iso-repack.sh +++ b/scripts/iso/iso-repack.sh @@ -103,7 +103,7 @@ cp "$GCFG" "$ORIG_CFG" # --- 2. BRANDING + SINGLE-ENTRY MENU SURGERY (R-38) ------------------------------------------------ #==================================================================================================== if [[ "$BRAND" == "1" ]]; then - say "branding GRUB (background + single-entry menu)" + say "branding GRUB (background + $( [[ "$MENU" == "release" ]] && echo "two-entry INTERACTIVE release menu" || echo "single-entry menu" ))" # 2a. R-155 — the guard, NARROWED rather than removed. #