Update bootctl command for new --variables= option (#3396)
Co-authored-by: Anton Hvornum <torxed@archlinux.org>
This commit is contained in:
parent
43963a1d8f
commit
46550221d1
|
|
@ -1174,10 +1174,13 @@ class Installer:
|
||||||
|
|
||||||
# Install the boot loader
|
# Install the boot loader
|
||||||
try:
|
try:
|
||||||
SysCommand(f'arch-chroot {self.target} bootctl {" ".join(bootctl_options)} install')
|
# 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")
|
||||||
except SysCallError:
|
except SysCallError:
|
||||||
# Fallback, try creating the boot loader without touching the EFI variables
|
# Fallback, try creating the boot loader without touching the EFI variables
|
||||||
SysCommand(f'arch-chroot {self.target} bootctl --no-variables {" ".join(bootctl_options)} install')
|
SysCommand(f"arch-chroot {self.target} bootctl --variables=no {' '.join(bootctl_options)} install")
|
||||||
|
|
||||||
# Loader configuration is stored in ESP/loader:
|
# Loader configuration is stored in ESP/loader:
|
||||||
# https://man.archlinux.org/man/loader.conf.5
|
# https://man.archlinux.org/man/loader.conf.5
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue