summary refs log tree commit diff
path: root/nixos/modules/system/boot/loader
diff options
context:
space:
mode:
authorEmily Ann Ediger <dje4321@gmail.com>2018-06-18 23:54:45 -0500
committerEmily Ann Ediger <dje4321@gmail.com>2018-06-18 23:54:45 -0500
commit08691d0515a44097fcaf27f59d002805afd0e105 (patch)
tree2fa218028770ddf386a6b7c84f4abfc367c808e8 /nixos/modules/system/boot/loader
parent4b649a99d8461c980e7028a693387dc48033c1f7 (diff)
downloadnixlib-08691d0515a44097fcaf27f59d002805afd0e105.tar
nixlib-08691d0515a44097fcaf27f59d002805afd0e105.tar.gz
nixlib-08691d0515a44097fcaf27f59d002805afd0e105.tar.bz2
nixlib-08691d0515a44097fcaf27f59d002805afd0e105.tar.lz
nixlib-08691d0515a44097fcaf27f59d002805afd0e105.tar.xz
nixlib-08691d0515a44097fcaf27f59d002805afd0e105.tar.zst
nixlib-08691d0515a44097fcaf27f59d002805afd0e105.zip
Grub: default is signed int. Fixes #42152
Diffstat (limited to 'nixos/modules/system/boot/loader')
-rw-r--r--nixos/modules/system/boot/loader/grub/grub.nix2
-rw-r--r--nixos/modules/system/boot/loader/grub/install-grub.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 2e497ff9f2c4..ee07d8657efd 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -386,7 +386,7 @@ in
 
       default = mkOption {
         default = 0;
-        type = types.int;
+        type = types.str;
         description = ''
           Index of the default menu item to be booted.
         '';
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 872261d0edfa..d1ff6e6bf525 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -54,7 +54,7 @@ my $splashImage = get("splashImage");
 my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
-my $defaultEntry = int(get("default"));
+my $defaultEntry = get("default");
 my $fsIdentifier = get("fsIdentifier");
 my $grubEfi = get("grubEfi");
 my $grubTargetEfi = get("grubTargetEfi");