Skip to content

fix(installer): resolve race condition and fs detection failure when mounting ESP #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Damian626 wants to merge 3 commits into
base: quattro
Choose a base branch
from
+4 −2
Open

fix(installer): resolve race condition and fs detection failure when mounting ESP #111

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2b85c1
Change mount command to specify filesystem type
Damian626 Aug 19, 2026
6d8ac0f
Type the ESP mount the fix was meant to type
omarchybot Aug 20, 2026
daa0cc3
fix: resolved merge conflict and applied suggestions
Damian626 Aug 20, 2026
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
6 changes: 4 additions & 2 deletions configs/airootfs/root/configurator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ detect_windows_esp() {
for p in $(blkid -t TYPE=vfat -o device 2>/dev/null); do
[[ "$p" == "$disk"* ]] || continue
tmp_mp=$(mktemp -d)
if mount -o ro "$p" "$tmp_mp" 2>/dev/null; then
if mount -t vfat -o ro "$p" "$tmp_mp" 2>/dev/null; then
if [[ -d "$tmp_mp/EFI/Microsoft" ]]; then
umount "$tmp_mp"; rmdir "$tmp_mp"
echo "$p"
Expand Down Expand Up @@ -770,7 +770,9 @@ run_partition_execute() {
mount -o noatime,compress=zstd,subvol=@pkg "$root_mapper" /mnt/var/cache/pacman/pkg

disk_step "creating the ESP filesystem on $efi_dev" mkfs.fat -F32 -n OMARCHY_EFI "$efi_dev"
disk_step "mounting the ESP" mount "$efi_dev" /mnt"$esp_mount_in_target"
# Typed, not probed: an unrecognised probe walks /proc/filesystems, and on
# the live ISO squashfs answers first.
disk_step "mounting the ESP" mount -t vfat "$efi_dev" /mnt"$esp_mount_in_target"

# The orchestrator's first act is to verify this handoff. Check it here so
# a failure names the step that broke rather than surfacing later as
Expand Down