diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-04-18 21:19:04 +0200 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-04-18 21:19:04 +0200 |
| commit | e6b664cafeafc848925984c65a2640a02b91e5f8 (patch) | |
| tree | 9aa75346c7ee9a523795e51d8bc30a189bda5a3a /nixos | |
| parent | 5676e8b391496bedbd6aa2520f54aa327d779501 (diff) | |
| parent | 66c73da5f9fd5939f691ee17f93e7689ccaa5af2 (diff) | |
| download | nixlib-e6b664cafeafc848925984c65a2640a02b91e5f8.tar nixlib-e6b664cafeafc848925984c65a2640a02b91e5f8.tar.gz nixlib-e6b664cafeafc848925984c65a2640a02b91e5f8.tar.bz2 nixlib-e6b664cafeafc848925984c65a2640a02b91e5f8.tar.lz nixlib-e6b664cafeafc848925984c65a2640a02b91e5f8.tar.xz nixlib-e6b664cafeafc848925984c65a2640a02b91e5f8.tar.zst nixlib-e6b664cafeafc848925984c65a2640a02b91e5f8.zip | |
Merge pull request #7443 from ts468/fixgrub
Fix grub for "nodev" targets.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 2ef1fca19835..81009e9fb821 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -468,8 +468,8 @@ sub getEfiTarget { if ($grubTargetEfi eq "") { die } else {return "only" } } else { - # at least one grub target has to be given - die + # prevent an installation if neither grub nor grubEfi is given + return "neither" } } |