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
base: 984285355a57
Choose a base ref
...
head repository: NixOS/nixpkgs
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
    Copy the full SHA
    291499d View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2018

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

    lxd: Provide apparmor_parser
    @joachifm
    joachifm committed Nov 24, 2018
    Copy the full SHA
    f00bc13 View commit details
    Browse the repository at this point in the history