diff options
| author | Adam Stephens <adam@valkor.net> | 2023-09-14 08:18:41 -0400 |
|---|---|---|
| committer | Adam Stephens <adam@valkor.net> | 2023-09-14 09:17:33 -0400 |
| commit | 8565cd862a614cc53a5798d398b8b11d98122ba0 (patch) | |
| tree | 0a82a62655d16b5e4355ef47b24ab117121b48f8 /nixos | |
| parent | 3a2786eea085f040a66ecde1bc3ddc7099f6dbeb (diff) | |
| download | nixpkgs-8565cd862a614cc53a5798d398b8b11d98122ba0.tar nixpkgs-8565cd862a614cc53a5798d398b8b11d98122ba0.tar.gz nixpkgs-8565cd862a614cc53a5798d398b8b11d98122ba0.tar.bz2 nixpkgs-8565cd862a614cc53a5798d398b8b11d98122ba0.tar.lz nixpkgs-8565cd862a614cc53a5798d398b8b11d98122ba0.tar.xz nixpkgs-8565cd862a614cc53a5798d398b8b11d98122ba0.tar.zst nixpkgs-8565cd862a614cc53a5798d398b8b11d98122ba0.zip | |
systemd: allow udev-trigger to run on lxd containers with nesting
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/lxc-container.nix | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b6c3085c4f1..a4c387a8bb0 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -52,7 +52,7 @@ let "systemd-udevd-kernel.socket" "systemd-udevd.service" "systemd-udev-settle.service" - ] ++ (optional (!config.boot.isContainer) "systemd-udev-trigger.service") ++ [ + ] ++ (optional (!config.boot.isContainer || config.virtualisation.lxc.nestedContainer) "systemd-udev-trigger.service") ++ [ # hwdb.bin is managed by NixOS # "systemd-hwdb-update.service" diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 9402d3bf37d..7f01b450433 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -9,15 +9,16 @@ in { options = { virtualisation.lxc = { - privilegedContainer = lib.mkOption { - type = lib.types.bool; - default = false; - description = lib.mdDoc '' - Whether this LXC container will be running as a privileged container or not. If set to `true` then - additional configuration will be applied to the `systemd` instance running within the container as - recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/). - ''; - }; + nestedContainer = lib.mkEnableOption (lib.mdDoc '' + Whether this container is configured as a nested container. On LXD containers this is recommended + for all containers and is enabled with `security.nesting = true`. + ''); + + privilegedContainer = lib.mkEnableOption (lib.mdDoc '' + Whether this LXC container will be running as a privileged container or not. If set to `true` then + additional configuration will be applied to the `systemd` instance running within the container as + recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/). + ''); }; }; |