forked from mirrors/nixpkgs
Synced with trunk @ 15428, 15620
svn path=/nixos/branches/modular-nixos/; revision=15634
This commit is contained in:
parent
4dc9b6d378
commit
65908cccd1
|
@ -197,6 +197,16 @@ rec {
|
||||||
# system configurations.
|
# system configurations.
|
||||||
grubMenuBuilder = config.system.build.grubMenuBuilder;
|
grubMenuBuilder = config.system.build.grubMenuBuilder;
|
||||||
|
|
||||||
|
# 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)
|
||||||
|
{ inherit platform;
|
||||||
|
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
|
||||||
|
config.nesting.children;
|
||||||
|
configurationName = config.boot.configurationName;
|
||||||
|
|
||||||
# Putting it all together. This builds a store object containing
|
# Putting it all together. This builds a store object containing
|
||||||
# symlinks to the various parts of the built configuration (the
|
# symlinks to the various parts of the built configuration (the
|
||||||
|
@ -216,6 +226,8 @@ rec {
|
||||||
inherit grubMenuBuilder;
|
inherit grubMenuBuilder;
|
||||||
inherit etc;
|
inherit etc;
|
||||||
inherit systemPath;
|
inherit systemPath;
|
||||||
|
inherit children;
|
||||||
|
inherit configurationName;
|
||||||
kernel = kernel + "/vmlinuz";
|
kernel = kernel + "/vmlinuz";
|
||||||
initrd = initialRamdisk + "/initrd";
|
initrd = initialRamdisk + "/initrd";
|
||||||
# Most of these are needed by grub-install.
|
# Most of these are needed by grub-install.
|
||||||
|
@ -228,16 +240,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
|
|
||||||
children = map (x: ((import ./system.nix)
|
|
||||||
{ inherit platform;
|
|
||||||
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
|
|
||||||
config.nesting.children;
|
|
||||||
configurationName = config.boot.configurationName;
|
|
||||||
}) config.environment.checkConfigurationOptions
|
}) config.environment.checkConfigurationOptions
|
||||||
optionDeclarations config;
|
optionDeclarations config;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue