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 | |
parent | 587473c574079a72e0c0c57c2ccd106511e5d2f3 (diff) | |
download | nixpkgs-9f0e137338a0c8186a104b4af5c6d49d09552784.tar nixpkgs-9f0e137338a0c8186a104b4af5c6d49d09552784.tar.gz nixpkgs-9f0e137338a0c8186a104b4af5c6d49d09552784.tar.bz2 nixpkgs-9f0e137338a0c8186a104b4af5c6d49d09552784.tar.lz nixpkgs-9f0e137338a0c8186a104b4af5c6d49d09552784.tar.xz nixpkgs-9f0e137338a0c8186a104b4af5c6d49d09552784.tar.zst nixpkgs-9f0e137338a0c8186a104b4af5c6d49d09552784.zip |
Rename boot.loader.gummiboot.enable -> boot.loader.systemd-boot.enable
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/installation/installing-uefi.xml | 4 | ||||
-rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 4 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 11 | ||||
-rw-r--r-- | nixos/tests/installer.nix | 14 |
4 files changed, 19 insertions, 14 deletions
diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml index 90d18695447..1cb43112944 100644 --- a/nixos/doc/manual/installation/installing-uefi.xml +++ b/nixos/doc/manual/installation/installing-uefi.xml @@ -26,7 +26,7 @@ changes: <literal>vfat</literal> filesystem.</para> </listitem> <listitem> - <para>You must set <option>boot.loader.gummiboot.enable</option> to + <para>You must set <option>boot.loader.systemd-boot.enable</option> to <literal>true</literal>. <command>nixos-generate-config</command> should do this automatically for new configurations when booted in UEFI mode.</para> @@ -38,7 +38,7 @@ changes: </listitem> <listitem> <para>You may want to look at the options starting with - <option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option> + <option>boot.loader.efi</option> and <option>boot.loader.systemd-boot</option> as well.</para> </listitem> </itemizedlist> diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index ca7fb71ba9b..5e576367eb2 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 2225df34876..3a43a02228d 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") diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 44c7c738d55..4a30cc18b02 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -30,8 +30,8 @@ let boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount}; ''} - ${optionalString (bootLoader == "gummiboot") '' - boot.loader.gummiboot.enable = true; + ${optionalString (bootLoader == "systemd-boot") '' + boot.loader.systemd-boot.enable = true; ''} hardware.enableAllFirmware = lib.mkForce false; @@ -57,7 +57,7 @@ let (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + (optionalString (system == "x86_64-linux") "-cpu kvm64 "); hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '' - + optionalString (bootLoader == "gummiboot") ''bios => "${pkgs.OVMF}/FV/OVMF.fd", ''; + + optionalString (bootLoader == "systemd-boot") ''bios => "${pkgs.OVMF}/FV/OVMF.fd", ''; in '' $machine->start; @@ -159,7 +159,7 @@ let makeInstallerTest = name: { createPartitions, preBootCommands ? "", extraConfig ? "" - , bootLoader ? "grub" # either "grub" or "gummiboot" + , bootLoader ? "grub" # either "grub" or "systemd-boot" , grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" , enableOCR ? false, meta ? {} }: @@ -195,7 +195,7 @@ let virtualisation.qemu.diskInterface = if grubVersion == 1 then "scsi" else "virtio"; - boot.loader.gummiboot.enable = mkIf (bootLoader == "gummiboot") true; + boot.loader.systemd-boot.enable = mkIf (bootLoader == "systemd-boot") true; hardware.enableAllFirmware = mkForce false; @@ -249,7 +249,7 @@ in { ''; }; - # Simple GPT/UEFI configuration using Gummiboot with 3 partitions: ESP, swap & root filesystem + # Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem simpleUefiGummiboot = makeInstallerTest "simpleUefiGummiboot" { createPartitions = '' @@ -269,7 +269,7 @@ in { "mount LABEL=BOOT /mnt/boot", ); ''; - bootLoader = "gummiboot"; + bootLoader = "systemd-boot"; }; # Same as the previous, but now with a separate /boot partition. |