Author: mkwik
Date: Fri May 18 06:17:05 2012
New Revision: 34163
URL: https://nixos.org/websvn/nix/?rev=34163&sc=1
Log:
Revert "Provided a workaround for grub's missing-devices check, so nested child
configurations can still build."
This reverts commit a89e8831e3d95bcf3ddc19ee34b938db7e8aa572.
Modified:
nixos/trunk/modules/installer/grub/grub.nix
nixos/trunk/modules/system/activation/no-clone.nix
Modified: nixos/trunk/modules/installer/grub/grub.nix
==============================================================================
--- nixos/trunk/modules/installer/grub/grub.nix Thu May 17 21:10:42 2012
(r34162)
+++ nixos/trunk/modules/installer/grub/grub.nix Fri May 18 06:17:05 2012
(r34163)
@@ -136,14 +136,6 @@
'';
};
- 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 {
default =
if config.boot.loader.grub.version == 1
@@ -205,7 +197,7 @@
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."
{ menuBuilder = grubMenuBuilder;
inherit grub;
Modified: nixos/trunk/modules/system/activation/no-clone.nix
==============================================================================
--- nixos/trunk/modules/system/activation/no-clone.nix Thu May 17 21:10:42
2012 (r34162)
+++ nixos/trunk/modules/system/activation/no-clone.nix Fri May 18 06:17:05
2012 (r34163)
@@ -6,9 +6,8 @@
{
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.loader.grub.ignoreDevicesCheck = mkOverrideTemplate 0 {} true;
nesting.children = mkOverrideTemplate 0 {} [];
nesting.clone = mkOverrideTemplate 0 {} [];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
