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: 984285355a57
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f00bc13ad7c3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 20, 2018

  1. 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>
    @andersk
    andersk committed Nov 20, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    291499d View commit details

Commits on Nov 24, 2018

  1. Merge pull request #50831 from andersk/lxd-apparmor_parser 

    lxd: Provide apparmor_parser
    @joachifm
    joachifm authored Nov 24, 2018
    Copy the full SHA
    f00bc13 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/tools/admin/lxd/default.nix
4 changes: 4 additions & 0 deletions pkgs/tools/admin/lxd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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' "$@"
'')
]}
'';