From 26e952582f9827817c08477355b58c74f3596ea4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 May 2009 11:08:17 +0000 Subject: [PATCH] Export some configuration data about on-boot layout svn path=/nixos/trunk/; revision=15428 --- system/system.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/system/system.nix b/system/system.nix index ed7967c5f633..2c60b82f066b 100644 --- a/system/system.nix +++ b/system/system.nix @@ -379,6 +379,11 @@ rec { grubSplashImage bootMount configurationLimit; }; + 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 # symlinks to the various parts of the built configuration (the @@ -398,6 +403,8 @@ rec { inherit grubMenuBuilder; inherit etc; inherit systemPath; + inherit children; + inherit configurationName; kernel = kernel + "/vmlinuz"; initrd = initialRamdisk + "/initrd"; # Most of these are needed by grub-install. @@ -415,11 +422,6 @@ rec { # 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 optionDeclarations config;