summaryrefslogtreecommitdiffstats
path: root/nixos/modules/virtualisation/xen-dom0.nix
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-12-23 07:19:45 -0500
committerGitHub <noreply@github.com>2017-12-23 07:19:45 -0500
commitb5a61f2c599ac665e3c3129258ea8671cb5760af (patch)
treeac16b806bfd54846edba76b0f21ff5d929570ff4 /nixos/modules/virtualisation/xen-dom0.nix
parentd3a0eb320a5e28a19b82f813e001fa832d7ef1d3 (diff)
Revert "nixos: doc: implement related packages in the manual"
Diffstat (limited to 'nixos/modules/virtualisation/xen-dom0.nix')
-rw-r--r--nixos/modules/virtualisation/xen-dom0.nix25
1 files changed, 15 insertions, 10 deletions
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index afc5a42f8b4e..c7656bc309c0 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -35,19 +35,24 @@ in
description = ''
The package used for Xen binary.
'';
- relatedPackages = [ "xen" "xen-light" ];
};
- virtualisation.xen.package-qemu = mkOption {
+ virtualisation.xen.qemu = mkOption {
+ type = types.path;
+ defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386";
+ example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
+ description = ''
+ The qemu binary to use for Dom-0 backend.
+ '';
+ };
+
+ virtualisation.xen.qemu-package = mkOption {
type = types.package;
defaultText = "pkgs.xen";
example = literalExample "pkgs.qemu_xen-light";
description = ''
- The package with qemu binaries for dom0 qemu and xendomains.
+ The package with qemu binaries for xendomains.
'';
- relatedPackages = [ "xen"
- { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; }
- ];
};
virtualisation.xen.bootParams =
@@ -153,7 +158,8 @@ in
} ];
virtualisation.xen.package = mkDefault pkgs.xen;
- virtualisation.xen.package-qemu = mkDefault pkgs.xen;
+ virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
+ virtualisation.xen.qemu-package = mkDefault pkgs.xen;
virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
environment.systemPackages = [ cfg.package ];
@@ -333,8 +339,7 @@ in
after = [ "xen-console.service" ];
requires = [ "xen-store.service" ];
serviceConfig.ExecStart = ''
- ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \
- -xen-attach -xen-domid 0 -name dom0 -M xenpv \
+ ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \
-nographic -monitor /dev/null -serial /dev/null -parallel /dev/null
'';
};
@@ -443,7 +448,7 @@ in
before = [ "dhcpd.service" ];
restartIfChanged = false;
serviceConfig.RemainAfterExit = "yes";
- path = [ cfg.package cfg.package-qemu ];
+ path = [ cfg.package cfg.qemu-package ];
environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains";
preStart = "mkdir -p /var/lock/subsys -m 755";
serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start";