diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-02-17 09:08:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-17 09:08:08 +0000 |
| commit | cac0d0eb33b64610db42a5f5e01ba29a8c46c3a7 (patch) | |
| tree | 4b8d6e27066586451235de87061e81f769467972 /nixos/modules | |
| parent | 4b43e72af7191be41454a024b65e52fb97905397 (diff) | |
| parent | 65faff97ffe19bca242166c333eeb6b191aa3dd2 (diff) | |
| download | nixlib-cac0d0eb33b64610db42a5f5e01ba29a8c46c3a7.tar nixlib-cac0d0eb33b64610db42a5f5e01ba29a8c46c3a7.tar.gz nixlib-cac0d0eb33b64610db42a5f5e01ba29a8c46c3a7.tar.bz2 nixlib-cac0d0eb33b64610db42a5f5e01ba29a8c46c3a7.tar.lz nixlib-cac0d0eb33b64610db42a5f5e01ba29a8c46c3a7.tar.xz nixlib-cac0d0eb33b64610db42a5f5e01ba29a8c46c3a7.tar.zst nixlib-cac0d0eb33b64610db42a5f5e01ba29a8c46c3a7.zip | |
Merge pull request #34803 from mt-caret/lxd-partial-fix
nixos/lxd: partial fix for lxd breakage
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/virtualisation/lxd.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index b1ff0337994e..4988886baf60 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -38,6 +38,15 @@ in environment.systemPackages = [ pkgs.lxd ]; + security.apparmor = { + enable = true; + profiles = [ + "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start" + "${pkgs.lxc}/etc/apparmor.d/lxc-containers" + ]; + packages = [ pkgs.lxc ]; + }; + systemd.services.lxd = { description = "LXD Container Management Daemon"; @@ -47,6 +56,10 @@ in # TODO(wkennington): Add lvm2 and thin-provisioning-tools path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ]; + preStart = '' + mkdir -m 0755 -p /var/lib/lxc/rootfs + ''; + serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd"; serviceConfig.Type = "simple"; serviceConfig.KillMode = "process"; # when stopping, leave the containers alone |