Skip to content

Grub: default is signed int. Fixes #42152 #42211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mic92 merged 3 commits into from
Jun 19, 2018
+4 −3
Merged

Grub: default is signed int. Fixes #42152 #42211

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08691d0
Grub: default is signed int. Fixes #42152
dje4321 Jun 19, 2018
ae04fb0
set default to type.str
dje4321 Jun 19, 2018
ac01365
added suggestion to support both str and int
dje4321 Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nixos/modules/system/boot/loader/grub/grub.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ in
};

default = mkOption {
default = 0;
type = types.int;
default = "0";
type = types.str;

@Mic92 Mic92 Jun 19, 2018 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about?

type = types.either types.int types.str;
apply = toString;

or

type = types.either types.int (types.enum [ "saved" ]);
apply = toString;

@dje4321 dje4321 Jun 19, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh neat. didnt know you could do the either thing

description = ''
Index of the default menu item to be booted.
'';
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/loader/grub/install-grub.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ sub runCommand {
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");
Expand Down