diff options
| author | Shea Levy <shea@shealevy.com> | 2016-08-16 07:51:58 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-08-16 07:51:58 -0400 |
| commit | b4954a8f3802ba545933905428a4288622f28294 (patch) | |
| tree | e58ea149d7ecf20cbcc9cdcb6bbe6f0a9bd2c428 /nixos/modules/system/boot/loader/grub | |
| parent | 38f306f492e21140d2888c9b6de20d4a5c925387 (diff) | |
| download | nixlib-b4954a8f3802ba545933905428a4288622f28294.tar nixlib-b4954a8f3802ba545933905428a4288622f28294.tar.gz nixlib-b4954a8f3802ba545933905428a4288622f28294.tar.bz2 nixlib-b4954a8f3802ba545933905428a4288622f28294.tar.lz nixlib-b4954a8f3802ba545933905428a4288622f28294.tar.xz nixlib-b4954a8f3802ba545933905428a4288622f28294.tar.zst nixlib-b4954a8f3802ba545933905428a4288622f28294.zip | |
Deprecate --install-grub in favor of --install-bootloader for nixos-rebuild.
Fixes #14293
Diffstat (limited to 'nixos/modules/system/boot/loader/grub')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 94d87b436065..4fa157641a4a 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -508,7 +508,11 @@ my $nameDiffer = get("fullName") ne $prevGrubState->name; my $versionDiffer = get("fullVersion") ne $prevGrubState->version; my $efiDiffer = $efiTarget ne $prevGrubState->efi; my $efiMountPointDiffer = $efiSysMountPoint ne $prevGrubState->efiMountPoint; -my $requireNewInstall = $devicesDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1"); +if (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1") { + warn "NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER"; + $ENV{'NIXOS_INSTALL_BOOTLOADER'} = "1"; +} +my $requireNewInstall = $devicesDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_BOOTLOADER'} // "") eq "1"); # install a symlink so that grub can detect the boot drive my $tmpDir = File::Temp::tempdir(CLEANUP => 1) or die "Failed to create temporary space"; |