Merge pull request #255116 from adamcstephens/lxd/udev-container

systemd: allow udev-trigger to run on lxd containers with nesting

Changed files
+11 -10
nixos
modules
system
virtualisation
+1 -1
nixos/modules/system/boot/systemd.nix
···
"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"
+10 -9
nixos/modules/virtualisation/lxc-container.nix
···
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/).
+
'');
};
};