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:
parent
8ffef5e73a
commit
ae6104ae59
@ -420,6 +420,9 @@
|
|||||||
specify a volume label (<literal>label</literal>) for file
|
specify a volume label (<literal>label</literal>) for file
|
||||||
systems that support it, such as ext2/ext3 (see <command>mke2fs
|
systems that support it, such as ext2/ext3 (see <command>mke2fs
|
||||||
-L</command>).
|
-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 {
|
tcpEnable = mkOption {
|
||||||
default = false;
|
default = false;
|
||||||
description = "
|
description = "
|
||||||
|
@ -357,7 +357,8 @@ rec {
|
|||||||
pkgs.upstart # for initctl
|
pkgs.upstart # for initctl
|
||||||
];
|
];
|
||||||
children = map (x: ((import ./system.nix)
|
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;
|
config.nesting.children;
|
||||||
configurationName = config.boot.configurationName;
|
configurationName = config.boot.configurationName;
|
||||||
}) (pkgs.getConfig ["checkConfigurationOptions"] false)
|
}) (pkgs.getConfig ["checkConfigurationOptions"] false)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user