Skip to content

Added temporary hold on bootctl's --variables=BOOL usage, as it's notin systemd main yet #3625

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

Merged
Torxed merged 5 commits into from
Jun 27, 2025
+16 −3
Merged

Added temporary hold on bootctl's --variables=BOOL usage, as it's notin systemd main yet #3625

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16d1459
Added temporary hold on bootctl's --variables=BOOL usage, as it's not…
Torxed Jun 23, 2025
7b498f6
Fixed ruff format check
Torxed Jun 23, 2025
251070a
Fixed mypy type check issue
Torxed Jun 23, 2025
f1b7bf0
Spelling error
Torxed Jun 23, 2025
8630f6f
Fixed flake8 complaint
Torxed Jun 23, 2025
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
19 changes: 16 additions & 3 deletions archinstall/lib/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,15 +1172,28 @@ def _add_systemd_bootloader(
bootctl_options.append(f'--esp-path={efi_partition.mountpoint}')
bootctl_options.append(f'--boot-path={boot_partition.mountpoint}')

# TODO: This is a temporary workaround to deal with https://github.com/archlinux/archinstall/pull/3396#issuecomment-2996862019
# the systemd_version check can be removed once `--variables=BOOL` is merged into systemd.
if pacman_q_systemd := self.pacman.run('-Q systemd').trace_log:
systemd_version = int(pacman_q_systemd.split(b' ')[1][:3].decode())
else:
systemd_version = 257 # This works as a safety workaround for this hot-fix

# Install the boot loader
try:
# Force EFI variables since bootctl detects arch-chroot
# as a container environemnt since v257 and skips them silently.
# https://github.com/systemd/systemd/issues/36174
SysCommand(f'arch-chroot {self.target} bootctl --variables=yes {" ".join(bootctl_options)} install')
if systemd_version >= 258:
SysCommand(f'arch-chroot {self.target} bootctl --variables=yes {" ".join(bootctl_options)} install')
else:
SysCommand(f'arch-chroot {self.target} bootctl {" ".join(bootctl_options)} install')
except SysCallError:
# Fallback, try creating the boot loader without touching the EFI variables
SysCommand(f'arch-chroot {self.target} bootctl --variables=no {" ".join(bootctl_options)} install')
if systemd_version >= 258:
# Fallback, try creating the boot loader without touching the EFI variables
SysCommand(f'arch-chroot {self.target} bootctl --variables=no {" ".join(bootctl_options)} install')
else:
SysCommand(f'arch-chroot {self.target} bootctl --no-variables {" ".join(bootctl_options)} install')

# Loader configuration is stored in ESP/loader:
# https://man.archlinux.org/man/loader.conf.5
Expand Down