Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion iso/scripts/luks-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,32 @@ TEST_PASSWORD="${UTAH_E2E_PASSWORD:-utahtest}"
# falling back.
TERMINAL_APP="${UTAH_E2E_TERMINAL:-com.mitchellh.ghostty}"

# Display size and terminal geometry for the screenshots. These exist because
# fastfetch with its logo needs about 90 columns -- roughly 33 for the logo
# column plus a ~57 character detail line -- while Ghostty opens at 80x24. The
# detail lines wrapped and pushed fastfetch's own header off the top of the
# window, which is what #84 worked around by dropping the logo entirely with
# --logo none. The shot is the evidence on the repository front page, so it
# should carry the branding rather than hide it.
#
# Columns are the lever, not point size: Ghostty sizes its window in cells, so
# a smaller font alone gives a smaller window with the same 80 columns and the
# same wrap. What buys the columns is the display -- at 1920x1080 a 110-column
# window at 12pt is roughly 880px of 1920, so the logo fits with room to spare
# and the font stays large enough for the tesseract gate below to read. Doing
# this by shrinking the font on a 1280x800 screen would have traded the wrap
# for worse OCR. 35 rows keeps all of fastfetch on screen without scrolling.
#
# xres/yres are the EDID hints QEMU passes to the guest for a preferred mode;
# -vga none replaces the machine default with the same stdvga device rather
# than a different adapter, so nothing about the graphics path changes.
DISPLAY_WIDTH="${UTAH_E2E_DISPLAY_WIDTH:-1920}"
DISPLAY_HEIGHT="${UTAH_E2E_DISPLAY_HEIGHT:-1080}"
VGA_ARGS=(-vga none -device "VGA,xres=${DISPLAY_WIDTH},yres=${DISPLAY_HEIGHT}")
TERMINAL_FONT_SIZE="${UTAH_E2E_FONT_SIZE:-12}"
TERMINAL_COLUMNS="${UTAH_E2E_COLUMNS:-110}"
TERMINAL_ROWS="${UTAH_E2E_ROWS:-35}"

ISO="$(realpath "${ISO}")"
mkdir -p "${WORK}"
SHOTS="${WORK}/screenshots"
Expand Down Expand Up @@ -189,6 +215,7 @@ cp -f "${OVMF_VARS_SRC}" "${VARS}"

"${QEMU}" \
-machine q35 -cpu host -m "${VM_RAM}" -smp "${VM_CPUS}" ${ACCEL} \
"${VGA_ARGS[@]}" \
-drive "if=pflash,format=raw,readonly=on,file=${OVMF_CODE}" \
-drive "if=pflash,format=raw,file=${VARS}" \
-drive "if=none,id=iso,file=${ISO},media=cdrom,readonly=on,format=raw" \
Expand Down Expand Up @@ -389,6 +416,7 @@ echo "=== Phase 4/6: boot the installed disk ==="
cp -f "${VARS}" "${WORK}/ovmf-vars-installed.fd"
"${QEMU}" \
-machine q35 -cpu host -m "${VM_RAM}" -smp "${VM_CPUS}" ${ACCEL} \
"${VGA_ARGS[@]}" \
-drive "if=pflash,format=raw,readonly=on,file=${OVMF_CODE}" \
-drive "if=pflash,format=raw,file=${WORK}/ovmf-vars-installed.fd" \
-drive "if=none,id=disk,file=${INSTALL_DISK},format=qcow2" \
Expand Down Expand Up @@ -468,7 +496,20 @@ shot installed-greeter "${MONITOR_INSTALLED}"
# runs inside the session with a bus and a display of its own.
echo "Arranging for a terminal to open in the session..."
ssh_target "
grep -q 'utah-e2e fastfetch' ~/.bashrc 2>/dev/null || printf '%s\n' '[[ \$- == *i* ]] && { fastfetch --logo none && echo UTAH-E2E-FASTFETCH; } # utah-e2e fastfetch' >> ~/.bashrc
grep -q 'utah-e2e fastfetch' ~/.bashrc 2>/dev/null || printf '%s\n' '[[ \$- == *i* ]] && { fastfetch && echo UTAH-E2E-FASTFETCH; } # utah-e2e fastfetch' >> ~/.bashrc
# Ghostty is a flatpak here, and which config path it reads depends on
# whether the sandbox exposes xdg-config or keeps its own per-app dir, so
# write both rather than guess. An unknown key would only be warned about,
# and a geometry that failed to apply shows up as the OCR gate failing
# rather than as a quietly bad screenshot.
for _cfgdir in ~/.config/ghostty ~/.var/app/${TERMINAL_APP}/config/ghostty; do
mkdir -p \"\${_cfgdir}\"
cat > \"\${_cfgdir}/config\" <<CFG
font-size = ${TERMINAL_FONT_SIZE}
window-width = ${TERMINAL_COLUMNS}
window-height = ${TERMINAL_ROWS}
CFG
done
mkdir -p ~/.config/autostart
cat > ~/.config/autostart/${TERMINAL_APP}.desktop <<EOF
[Desktop Entry]
Expand Down
25 changes: 13 additions & 12 deletions packages/utah.toml
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,21 @@ packages = [
# until that path is supported; tracked by #83.
#
# libgda, libgda-sqlite
# Runtime dependencies of the maintained Copyous extension, added upstream
# in projectbluefin/bluefin#1210. Neither name exists in the pinned factory
# image or in public-hummingbird-x86_64-rpms, and Hummingbird carries no
# package whose name contains "gda" at all. Both come from one SRPM --
# libgda-sqlite is the %package sqlite subpackage of Fedora's libgda.spec --
# so a single factory recipe with the sqlite provider enabled yields both.
# Tracked by #106.
# Upstream added both as runtime dependencies for the maintained Copyous
# extension (bluefin#1210). Neither is in the pinned factory image or in
# public-hummingbird-x86_64-rpms -- Hummingbird carries no package whose
# name contains gda at all. One factory recipe would cover both, because
# libgda-sqlite is a subpackage of the libgda SRPM rather than its own
# source. Tracked by #106.
#
# ppp
# Absent from both repositories, and nothing in either Provides: ppp, so no
# alternate name satisfies it. This also leaves Hummingbird's own
# NetworkManager-ppp uninstallable, since its metadata Requires: ppp --
# NetworkManager's PPPoE, PPTP and mobile-broadband paths cannot be
# installed at all rather than merely being absent. Tracked by #107.
# In neither repository, and nothing in either Provides it. This one costs
# more than dial-up: Hummingbird ships NetworkManager-ppp (1.58.0-1.hum1
# and 1.58.1-1.hum1) whose metadata carries Requires: ppp, so that plugin
# is uninstallable from their own repository and NetworkManager's PPPoE and
# PPTP paths cannot be installed at all. The same shape as avahi (#104) and
# nautilus (#100): a plugin shipped without the daemon behind it.
# Tracked by #107.
#
# grub2-efi-x64-cdboot and pipewire-libs-extra are supplied by the pinned
# September 10 factory candidate and return to the install contract (#35).
Expand Down
Loading