pyrox.dev
Use systemd-boot instead of gummiboot
Gummiboot is part of systemd now so we may as well use it.
+2
-5
nixos/modules/system/boot/loader/efi.nix
+2
-5
nixos/modules/system/boot/loader/efi.nix
···
4
4
5
5
{
6
6
options.boot.loader.efi = {
7
+
7
8
canTouchEfiVariables = mkOption {
8
9
default = false;
9
-
10
10
type = types.bool;
11
-
12
-
description = "Whether or not the installation process should modify efi boot variables.";
11
+
description = "Whether the installation process is allowed to modify EFI boot variables.";
13
12
};
14
13
15
14
efiSysMountPoint = mkOption {
16
15
default = "/boot";
17
-
18
16
type = types.str;
19
-
20
17
description = "Where the EFI System Partition is mounted.";
21
18
};
22
19
};
+1
-1
nixos/modules/system/boot/loader/grub/grub.nix
+1
-1
nixos/modules/system/boot/loader/grub/grub.nix
···
488
488
}
489
489
{
490
490
assertion = if args.efiSysMountPoint == null then true else hasPrefix "/" args.efiSysMountPoint;
491
-
message = "Efi paths must be absolute, not ${args.efiSysMountPoint}";
491
+
message = "EFI paths must be absolute, not ${args.efiSysMountPoint}";
492
492
}
493
493
] ++ flip map args.devices (device: {
494
494
assertion = device == "nodev" || hasPrefix "/" device;
+3
-3
nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+3
-3
nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
···
88
88
if not path in known_paths:
89
89
os.unlink(path)
90
90
91
-
parser = argparse.ArgumentParser(description='Update NixOS-related gummiboot files')
91
+
parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files')
92
92
parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
93
93
args = parser.parse_args()
94
94
95
95
# We deserve our own env var!
96
96
if os.getenv("NIXOS_INSTALL_GRUB") == "1":
97
97
if "@canTouchEfiVariables@" == "1":
98
-
subprocess.check_call(["@gummiboot@/bin/gummiboot", "--path=@efiSysMountPoint@", "install"])
98
+
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"])
99
99
else:
100
-
subprocess.check_call(["@gummiboot@/bin/gummiboot", "--path=@efiSysMountPoint@", "--no-variables", "install"])
100
+
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "--no-variables", "install"])
101
101
102
102
mkdir_p("@efiSysMountPoint@/efi/nixos")
103
103
mkdir_p("@efiSysMountPoint@/loader/entries")
+4
-2
nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+4
-2
nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
···
12
12
13
13
isExecutable = true;
14
14
15
-
inherit (pkgs) python gummiboot;
15
+
inherit (pkgs) python;
16
+
17
+
systemd = config.systemd.package;
16
18
17
19
nix = config.nix.package.out;
18
20
···
27
29
28
30
type = types.bool;
29
31
30
-
description = "Whether to enable the gummiboot UEFI boot manager";
32
+
description = "Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager";
31
33
};
32
34
};
33
35