From 7fca5408f333d1f752353064a7409150bf14f23f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 18 May 2012 06:17:05 +0000 Subject: [PATCH] Revert "Provided a workaround for grub's missing-devices check, so nested child configurations can still build." This reverts commit a89e8831e3d95bcf3ddc19ee34b938db7e8aa572. svn path=/nixos/trunk/; revision=34163 --- modules/installer/grub/grub.nix | 10 +--------- modules/system/activation/no-clone.nix | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix index 73841b3778b8..97e5f12d048c 100644 --- a/modules/installer/grub/grub.nix +++ b/modules/installer/grub/grub.nix @@ -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 { default = if config.boot.loader.grub.version == 1 @@ -205,7 +197,7 @@ in 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; diff --git a/modules/system/activation/no-clone.nix b/modules/system/activation/no-clone.nix index c78086466d16..74df217a01aa 100644 --- a/modules/system/activation/no-clone.nix +++ b/modules/system/activation/no-clone.nix @@ -6,9 +6,8 @@ with pkgs.lib; { 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 {} []; }