diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-06-05 11:12:34 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-06-05 11:12:34 +0200 |
| commit | c0ccf42c69845b10c1acd98e93f2d427d429250a (patch) | |
| tree | 05571464ace23e44ea411ad150cdf2d926b3f14a /nixos/modules/system | |
| parent | eb7c14fad15e4762a0f54a83decc964b3ae77409 (diff) | |
| parent | 576af1718704f9eca5db0983a94edcf8d06caddd (diff) | |
| download | nixlib-c0ccf42c69845b10c1acd98e93f2d427d429250a.tar nixlib-c0ccf42c69845b10c1acd98e93f2d427d429250a.tar.gz nixlib-c0ccf42c69845b10c1acd98e93f2d427d429250a.tar.bz2 nixlib-c0ccf42c69845b10c1acd98e93f2d427d429250a.tar.lz nixlib-c0ccf42c69845b10c1acd98e93f2d427d429250a.tar.xz nixlib-c0ccf42c69845b10c1acd98e93f2d427d429250a.tar.zst nixlib-c0ccf42c69845b10c1acd98e93f2d427d429250a.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py | 2 |
2 files changed, 2 insertions, 1 deletions
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. ''; 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(): |