BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nixos-rebuild: fix --install-bootloader flag with systemd-run

Browse source
This commit is contained in:
Thiago Kenji Okada 2023-10-22 12:19:59 +01:00
parent 6b51d202ea
commit b269e6853e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View file

@ -659,6 +659,7 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" =
cmd=(
"systemd-run"
"-E" "LOCALE_ARCHIVE" # Will be set to new value early in switch-to-configuration script, but interpreter starts out with old value
"-E" "NIXOS_INSTALL_BOOTLOADER"
"--collect"
"--no-ask-password"
"--pty"
@ -679,7 +680,12 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" =
cmd=()
elif ! targetHostCmd "${cmd[@]}" true &>/dev/null; then
logVerbose "Skipping systemd-run to switch configuration since it is not working in target host."
cmd=("env" "-i" "LOCALE_ARCHIVE=$LOCALE_ARCHIVE")
cmd=(
"env"
"-i"
"LOCALE_ARCHIVE=$LOCALE_ARCHIVE"
"NIXOS_INSTALL_BOOTLOADER=$NIXOS_INSTALL_BOOTLOADER"
)
else
logVerbose "Using systemd-run to switch configuration."
fi