diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-10-23 15:24:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 15:24:42 +0200 |
| commit | 4bf1366455856e0c01ad7e5446bcb426d77d3587 (patch) | |
| tree | 82f98b8556e3f0b0e6cabcb102c672fb51251cef /pkgs/os-specific | |
| parent | 2f90fcb9734fe0cd7ce414c32bb157ceb9309701 (diff) | |
| parent | 65cb8b4e01c43d20b820e8c938f53a54f76cc3b1 (diff) | |
| download | nixlib-4bf1366455856e0c01ad7e5446bcb426d77d3587.tar nixlib-4bf1366455856e0c01ad7e5446bcb426d77d3587.tar.gz nixlib-4bf1366455856e0c01ad7e5446bcb426d77d3587.tar.bz2 nixlib-4bf1366455856e0c01ad7e5446bcb426d77d3587.tar.lz nixlib-4bf1366455856e0c01ad7e5446bcb426d77d3587.tar.xz nixlib-4bf1366455856e0c01ad7e5446bcb426d77d3587.tar.zst nixlib-4bf1366455856e0c01ad7e5446bcb426d77d3587.zip | |
Merge pull request #262724 from thiagokokada/fix-install-bootloader
nixos-rebuild: fix --install-bootloader flag with systemd-run
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/nixos-rebuild/default.nix | 1 | ||||
| -rwxr-xr-x | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index c6ec0866791e..4ff0c8c32913 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -32,6 +32,7 @@ substituteAll { # run some a simple installer tests to make sure nixos-rebuild still works for them passthru.tests = { + install-bootloader = nixosTests.nixos-rebuild-install-bootloader; simple-installer = nixosTests.installer.simple; specialisations = nixosTests.nixos-rebuild-specialisations; }; diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 68e00690652e..9e75db6d27b5 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -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 |