public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: fix broken version comparisons

Browse Source 
string compare breaks with xen 4.10 (because "4.10" < "4.8")
This commit is contained in:
xeji
2018-03-04 13:35:20 +01:00
parent 1deb779a7a
commit fbc0b8282e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/virtualisation/xen-dom0.nix
View File

@@ -262,7 +262,7 @@ in
mkdir -p /var/lib/xen # so we create them here unconditionally.
grep -q control_d /proc/xen/capabilities
'';
serviceConfig = if cfg.package.version < "4.8" then
serviceConfig = if (builtins.compareVersions cfg.package.version "4.8" < 0) then
{ ExecStart = ''
${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork
'';
@@ -275,7 +275,7 @@ in
NotifyAccess = "all";
};
postStart = ''
${optionalString (cfg.package.version < "4.8") ''
${optionalString (builtins.compareVersions cfg.package.version "4.8" < 0) ''
time=0
timeout=30
# Wait for xenstored to actually come up, timing out after 30 seconds
@@ -320,7 +320,7 @@ in
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/xenconsoled\
${optionalString ((cfg.package.version >= "4.8")) " -i"}\
${optionalString ((builtins.compareVersions cfg.package.version "4.8" >= 0)) " -i"}\
${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"}
'';
};