alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* boor.loader.grub.device can only be defined once.

Browse source 
* Replace an obscure piece of code by its equivalent based on the
  recursiveUpdate function.  Undefined the obsolete name of
  boot.grubDevice to avoid conflicts.

svn path=/nixos/trunk/; revision=18049
This commit is contained in:
Nicolas Pierron 2009-10-30 11:57:23 +00:00
parent b86e8208d5
commit 8c5b200164
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/installer/grub/grub.nix
View file

@ -45,6 +45,7 @@ in
device = mkOption {
default = "";
example = "/dev/hda";
type = with pkgs.lib.types; uniq string;
description = ''
The device on which the boot loader, GRUB, will be installed.
If empty, GRUB won't be installed and it's your responsibility

14
modules/system/activation/top-level.nix
View file

@ -41,9 +41,17 @@ let
# you can provide an easy way to boot the same configuration
# as you use, but with another kernel
# !!! fix this
children = map (x: ((import ../../../default.nix)
{ configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
config.nesting.children;
children =
map (childConfig:
(import ../../../default.nix {
configuration =
pkgs.lib.recursiveUpdate childConfig {
boot.loader.grub.device = "";
# undefined the obsolete name of the previous option.
boot.grubDevice = pkgs.lib.mkNotdef;
};
}).system
) config.nesting.children;
systemBuilder =