diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-25 14:59:01 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-25 14:59:01 +0100 |
| commit | d545772640d13e0d2d984ad582888deda7cefa86 (patch) | |
| tree | 8636220086e54fb1501ea0831284a4e8aa9769be /pkgs/development/libraries/libvirt | |
| parent | ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d (diff) | |
| download | nixpkgs-d545772640d13e0d2d984ad582888deda7cefa86.tar nixpkgs-d545772640d13e0d2d984ad582888deda7cefa86.tar.gz nixpkgs-d545772640d13e0d2d984ad582888deda7cefa86.tar.bz2 nixpkgs-d545772640d13e0d2d984ad582888deda7cefa86.tar.lz nixpkgs-d545772640d13e0d2d984ad582888deda7cefa86.tar.xz nixpkgs-d545772640d13e0d2d984ad582888deda7cefa86.tar.zst nixpkgs-d545772640d13e0d2d984ad582888deda7cefa86.zip | |
libvirt: make guest suspend work, use upstream units
Diffstat (limited to 'pkgs/development/libraries/libvirt')
| -rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 08a70b5514d..aa044c885ea 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { "--with-numad" "--with-macvtap" "--with-virtualport" - "--with-init-script=redhat" + "--with-init-script=systemd+redhat" "--with-storage-zfs" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { postInstall = '' sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace "$out/bin" "${gettext}/bin" + --replace "$out/bin" "${gettext}/bin" \ + --replace "lock/subsys" "lock" + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* '' + optionalString stdenv.isLinux '' wrapProgram $out/sbin/libvirtd \ --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]} |