diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-13 12:15:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-13 12:15:51 -0400 |
commit | 9a846892a29b710a34a3461995075f3052505b91 (patch) | |
tree | d44299e7e3af0bdfdaf544759b9f14ddb3147608 /pkgs/tools | |
parent | f0df76e4b2b9a44ac227b8a66b25123d187230f8 (diff) | |
parent | e5b473afe998aa6a99ee1b5e845f01672e1d3acf (diff) | |
download | nixlib-9a846892a29b710a34a3461995075f3052505b91.tar nixlib-9a846892a29b710a34a3461995075f3052505b91.tar.gz nixlib-9a846892a29b710a34a3461995075f3052505b91.tar.bz2 nixlib-9a846892a29b710a34a3461995075f3052505b91.tar.lz nixlib-9a846892a29b710a34a3461995075f3052505b91.tar.xz nixlib-9a846892a29b710a34a3461995075f3052505b91.tar.zst nixlib-9a846892a29b710a34a3461995075f3052505b91.zip |
Merge pull request #64532 from plumelo/feature/lxd-criu
lxd: add criu to path and bash completions, lxc: fix bash completions
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 880ff331c933..9d55e6bdefad 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -3,6 +3,7 @@ , squashfsTools, iproute, iptables, ebtables, libcap, dqlite , sqlite-replication , writeShellScriptBin, apparmor-profiles, apparmor-parser +, criu , bash }: @@ -33,11 +34,14 @@ buildGoPackage rec { rm $bin/bin/{deps,macaroon-identity,generate} wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ]} + + mkdir -p "$bin/share/bash-completion/completions/" + cp -av go/src/github.com/lxc/lxd/scripts/bash/lxd-client "$bin/share/bash-completion/completions/lxc" ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; |