public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Provided a workaround for grub's missing-devices check, so nested child configurations can still build."

Browse Source 
This reverts commit a89e8831e3d95bcf3ddc19ee34b938db7e8aa572.

svn path=/nixos/trunk/; revision=34163
This commit is contained in:
Mathijs Kwik 2012-05-18 06:17:05 +00:00
parent 2577a17468
commit 7fca5408f3
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/installer/grub/grub.nix
View File

@ -136,14 +136,6 @@ in
''; '';
}; };
ignoreDevicesCheck = mkOption {
default = false;
description = ''
(internal use) Don't throw an error when devices aren't given
useful for building nested child configurations
'';
};
splashImage = mkOption { splashImage = mkOption {
default = default =
if config.boot.loader.grub.version == 1 if config.boot.loader.grub.version == 1
@ -205,7 +197,7 @@ in
boot.loader.grub.devices = optional (cfg.device != "") cfg.device; boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
system.build = mkAssert (cfg.devices != [] || cfg.ignoreDevicesCheck) system.build = mkAssert (cfg.devices != [])
"You must set the ‘boot.loader.grub.device’ option to make the system bootable." "You must set the ‘boot.loader.grub.device’ option to make the system bootable."
{ menuBuilder = grubMenuBuilder; { menuBuilder = grubMenuBuilder;
inherit grub; inherit grub;

3
modules/system/activation/no-clone.nix
View File

@ -6,9 +6,8 @@ with pkgs.lib;
{ {
boot.loader.grub.device = mkOverrideTemplate 0 {} ""; boot.loader.grub.device = mkOverrideTemplate 0 {} "";
# undefine the obsolete name of the previous option. # undefined the obsolete name of the previous option.
boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef; boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef;
boot.loader.grub.ignoreDevicesCheck = mkOverrideTemplate 0 {} true;
nesting.children = mkOverrideTemplate 0 {} []; nesting.children = mkOverrideTemplate 0 {} [];
nesting.clone = mkOverrideTemplate 0 {} []; nesting.clone = mkOverrideTemplate 0 {} [];
} }