Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e2f9c1b97b08
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6ef9875edb51
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 4, 2017

  1. xen service: Add the possibility to override configuration of xendomains 

    Add the option virtualisation.xen.domain.extraConfig, which
allows overriding options passed to xendomains.
    Michał Pałka committed May 4, 2017
    Copy the full SHA
    3b0daa1 View commit details

Commits on May 6, 2017

  1. Merge pull request #25494 from michalpalka/xendomains 

    xen service: Add the possibility to override configuration of xendomains
    @joachifm
    joachifm authored May 6, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6ef9875 View commit details
Showing with 18 additions and 1 deletion.
  1. +18 −1 nixos/modules/virtualisation/xen-dom0.nix
19 changes: 18 additions & 1 deletion nixos/modules/virtualisation/xen-dom0.nix
View file
Original file line number Diff line number Diff line change
@@ -111,6 +111,19 @@ in
'';
};

virtualisation.xen.domains = {
extraConfig = mkOption {
type = types.string;
default = "";
description =
''
Options defined here will override the defaults for xendomains.
The default options can be seen in the file included from
/etc/default/xendomains.
'';
};
};

virtualisation.xen.trace =
mkOption {
default = false;
@@ -216,7 +229,11 @@ in
{ source = "${cfg.package}/etc/xen/scripts";
target = "xen/scripts";
}
{ source = "${cfg.package}/etc/default/xendomains";
{ text = ''
source ${cfg.package}/etc/default/xendomains
${cfg.domains.extraConfig}
'';
target = "default/xendomains";
}
];