diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-06-01 12:51:33 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-06-01 12:55:52 +0200 |
commit | 9f0e137338a0c8186a104b4af5c6d49d09552784 (patch) | |
tree | 1bec27ea5351d4686d48af031e46b4d81c679e32 /nixos/modules | |
parent | 587473c574079a72e0c0c57c2ccd106511e5d2f3 (diff) |
Rename boot.loader.gummiboot.enable -> boot.loader.systemd-boot.enable
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 4 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index ca7fb71ba9b89..5e576367eb2f2 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -518,8 +518,8 @@ if ($showHardwareConfig) { my $bootLoaderConfig = ""; if (-e "/sys/firmware/efi/efivars") { $bootLoaderConfig = <<EOF; - # Use the gummiboot efi boot loader. - boot.loader.gummiboot.enable = true; + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; EOF } elsif ($virt ne "systemd-nspawn") { diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix index 2225df348762b..3a43a02228dd8 100644 --- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix +++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.boot.loader.gummiboot; + cfg = config.boot.loader.systemd-boot; efi = config.boot.loader.efi; @@ -23,7 +23,12 @@ let inherit (efi) efiSysMountPoint canTouchEfiVariables; }; in { - options.boot.loader.gummiboot = { + + imports = + [ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ]) + ]; + + options.boot.loader.systemd-boot = { enable = mkOption { default = false; @@ -47,7 +52,7 @@ in { system = { build.installBootLoader = gummibootBuilder; - boot.loader.id = "gummiboot"; + boot.loader.id = "systemd-boot"; requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "EFI_STUB") |