Deal with virtualisation.xen.stored in a more standard way

This commit is contained in:
Eelco Dolstra 2015-03-05 12:46:50 +01:00
parent 17479728ec
commit 9bb586943a

View File

@ -59,12 +59,11 @@ in
virtualisation.xen.stored = virtualisation.xen.stored =
mkOption { mkOption {
default = null; type = types.path;
description = description =
'' ''
Xen Store daemon to use. Defaults to oxenstored of the xen package. Xen Store daemon to use. Defaults to oxenstored of the xen package.
''; '';
apply = x: if x == null then "${xen}/bin/oxenstored" else x;
}; };
virtualisation.xen.trace = virtualisation.xen.trace =
@ -89,6 +88,8 @@ in
message = "Xen currently does not support EFI boot"; message = "Xen currently does not support EFI boot";
} ]; } ];
virtualisation.xen.stored = mkDefault "${xen}/bin/oxenstored";
environment.systemPackages = [ xen ]; environment.systemPackages = [ xen ];
# Make sure Domain 0 gets the required configuration # Make sure Domain 0 gets the required configuration