follow -r15428 and move the comment as well
svn path=/nixos/trunk/; revision=15620
This commit is contained in:
parent
3f79e158ba
commit
fa32ac7fb6
|
@ -379,6 +379,11 @@ rec {
|
||||||
grubSplashImage bootMount configurationLimit;
|
grubSplashImage bootMount configurationLimit;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# This attribute is responsible for creating boot entries for
|
||||||
|
# child configuration. They are only (directly) accessible
|
||||||
|
# when the parent configuration is boot default. For example,
|
||||||
|
# you can provide an easy way to boot the same configuration
|
||||||
|
# as you use, but with another kernel
|
||||||
children = map (x: ((import ./system.nix)
|
children = map (x: ((import ./system.nix)
|
||||||
{ inherit platform;
|
{ inherit platform;
|
||||||
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
|
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
|
||||||
|
@ -417,11 +422,6 @@ rec {
|
||||||
pkgs.upstart # for initctl
|
pkgs.upstart # for initctl
|
||||||
];
|
];
|
||||||
upstartInterfaceVersion = pkgs.upstart.interfaceVersion;
|
upstartInterfaceVersion = pkgs.upstart.interfaceVersion;
|
||||||
# This attribute is responsible for creating boot entries for
|
|
||||||
# child configuration. They are only (directly) accessible
|
|
||||||
# when the parent configuration is boot default. For example,
|
|
||||||
# you can provide an easy way to boot the same configuration
|
|
||||||
# as you use, but with another kernel
|
|
||||||
}) config.environment.checkConfigurationOptions
|
}) config.environment.checkConfigurationOptions
|
||||||
optionDeclarations config;
|
optionDeclarations config;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue