summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnders Kaseorg <andersk@mit.edu>2018-11-19 22:36:56 -0800
committerAnders Kaseorg <andersk@mit.edu>2018-11-19 22:42:04 -0800
commit291499d10ea380a6029e56f8492a1b5df3ee515b (patch)
tree5f41cfeb6f4ff98c53fb472df0c402ec92c81d60
parent80738ed9dc0ce48d7796baed5364eef8072c794d (diff)
downloadnixpkgs-291499d10ea380a6029e56f8492a1b5df3ee515b.tar
nixpkgs-291499d10ea380a6029e56f8492a1b5df3ee515b.tar.gz
nixpkgs-291499d10ea380a6029e56f8492a1b5df3ee515b.tar.bz2
nixpkgs-291499d10ea380a6029e56f8492a1b5df3ee515b.tar.lz
nixpkgs-291499d10ea380a6029e56f8492a1b5df3ee515b.tar.xz
nixpkgs-291499d10ea380a6029e56f8492a1b5df3ee515b.tar.zst
nixpkgs-291499d10ea380a6029e56f8492a1b5df3ee515b.zip
lxd: Provide apparmor_parser
Previously, lxd would complain about apparmor_parser being missing:

lxd[1037]: lvl=warn msg="AppArmor support has been disabled because 'apparmor_parser' couldn't be found" t=2018-11-19T18:32:47-0800

We need to provide a wrapped apparmor_parser that knows where to find
<tunables/global>, which is #included by lxd’s generated profiles.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
-rw-r--r--pkgs/tools/admin/lxd/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 09c29517af4..9eb249bc587 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -2,6 +2,7 @@
 , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
 , squashfsTools, iproute, iptables, ebtables, libcap, dqlite
 , sqlite-replication
+, writeShellScriptBin, apparmor-profiles, apparmor-parser
 }:
 
 buildGoPackage rec {
@@ -31,6 +32,9 @@ buildGoPackage rec {
 
     wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [
       acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables
+      (writeShellScriptBin "apparmor_parser" ''
+        exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
+      '')
     ]}
   '';