From fa2e4bfb61cc5826d36833b12fda312ac1261137 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 10 May 2019 08:42:23 +0300 Subject: nixos/systemd-boot: don't remove directories from EFI dir This will only result in an error. These directories might be created by, for example, fwupdmgr. --- nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/system') diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 940d4c0eb973..ebe37ca10a2d 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -154,7 +154,7 @@ def remove_old_entries(gens): except ValueError: pass for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"): - if not path in known_paths: + if not path in known_paths and not os.path.isdir(path): os.unlink(path) def get_profiles(): -- cgit v1.2.3 From fd9dec717710708cadbe0b1b9ae6bb1ac315c503 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 3 Jun 2019 22:19:44 +1000 Subject: nixos/grub: Add defaultText for font option Fixes #62602. --- nixos/modules/system/boot/loader/grub/grub.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/modules/system') diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 99aa7759c954..4e4d14985b0d 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -360,6 +360,7 @@ in font = mkOption { type = types.nullOr types.path; default = "${realGrub}/share/grub/unicode.pf2"; + defaultText = ''"''${pkgs.grub2}/share/grub/unicode.pf2"''; description = '' Path to a TrueType, OpenType, or pf2 font to be used by Grub. ''; -- cgit v1.2.3