Fixed a bit about child configurations, added an option to not run X job, but create it, and to export configuration files from it.

svn path=/nixos/trunk/; revision=9986
This commit is contained in:
Michael Raskin 2007-12-31 08:52:59 +00:00
parent 8ffef5e73a
commit ae6104ae59
2 changed files with 21 additions and 1 deletions

View file

@ -420,6 +420,9 @@
specify a volume label (<literal>label</literal>) for file
systems that support it, such as ext2/ext3 (see <command>mke2fs
-L</command>).
<literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with
<command>mkdir -p</command> .
";
};
@ -671,6 +674,22 @@
";
};
autorun = mkOption {
default = true;
description = "
Switch to false to create upstart-job and configuration,
but not run it automatically
";
};
exportConfiguration = mkOption {
default = false;
description = "
Create /etc/X11/xorg.conf and a file with environment
variables
";
};
tcpEnable = mkOption {
default = false;
description = "

View file

@ -357,7 +357,8 @@ rec {
pkgs.upstart # for initctl
];
children = map (x: ((import ./system.nix)
{inherit platform stage2Init; configuration = x;}).system)
{inherit platform stage2Init;
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
config.nesting.children;
configurationName = config.boot.configurationName;
}) (pkgs.getConfig ["checkConfigurationOptions"] false)