summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2015-02-19 19:33:17 -0500
committerShea Levy <shea@shealevy.com>2015-02-19 19:33:17 -0500
commit3e44f99055a0c9fddc49dc99301efbc80d497a82 (patch)
tree7b8b97b7e6a11854ce8d1fd440059f4c4349097a /nixos
parent7d129a88a5736c16e29591b1401fe6a6d744d82b (diff)
downloadnixlib-3e44f99055a0c9fddc49dc99301efbc80d497a82.tar
nixlib-3e44f99055a0c9fddc49dc99301efbc80d497a82.tar.gz
nixlib-3e44f99055a0c9fddc49dc99301efbc80d497a82.tar.bz2
nixlib-3e44f99055a0c9fddc49dc99301efbc80d497a82.tar.lz
nixlib-3e44f99055a0c9fddc49dc99301efbc80d497a82.tar.xz
nixlib-3e44f99055a0c9fddc49dc99301efbc80d497a82.tar.zst
nixlib-3e44f99055a0c9fddc49dc99301efbc80d497a82.zip
Fix grub 1 install
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/system/boot/loader/grub/install-grub.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 74a934c67931..2ef1fca19835 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -448,7 +448,9 @@ sub getDeviceTargets {
 
 # check whether to install GRUB EFI or not
 sub getEfiTarget {
-    if (($grub ne "") && ($grubEfi ne "")) {
+    if ($grubVersion == 1) {
+        return "no"
+    } elsif (($grub ne "") && ($grubEfi ne "")) {
         # EFI can only be installed when target is set;
         # A target is also required then for non-EFI grub
         if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die }