movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

systemd: revert allow udev-trigger for lxd nested containers

Browse source
This commit is contained in:
Adam Stephens 2023-09-28 12:11:41 -04:00 • committed by Adam Stephens
parent 3c584440af
commit b1237da5b2
No known key found for this signature in database
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/systemd.nix
View file

@ -53,7 +53,7 @@ let
"systemd-udevd-kernel.socket" "systemd-udevd-kernel.socket"
"systemd-udevd.service" "systemd-udevd.service"
"systemd-udev-settle.service" "systemd-udev-settle.service"
] ++ (optional (!config.boot.isContainer || config.virtualisation.lxc.nestedContainer) "systemd-udev-trigger.service") ++ [ ] ++ (optional (!config.boot.isContainer) "systemd-udev-trigger.service") ++ [
# hwdb.bin is managed by NixOS # hwdb.bin is managed by NixOS
# "systemd-hwdb-update.service" # "systemd-hwdb-update.service"

19
nixos/modules/virtualisation/lxc-container.nix
View file

@ -9,16 +9,15 @@ in {
options = { options = {
virtualisation.lxc = { virtualisation.lxc = {
nestedContainer = lib.mkEnableOption (lib.mdDoc '' privilegedContainer = lib.mkOption {
Whether this container is configured as a nested container. On LXD containers this is recommended type = lib.types.bool;
for all containers and is enabled with `security.nesting = true`. default = false;
''); description = lib.mdDoc ''
Whether this LXC container will be running as a privileged container or not. If set to `true` then
privilegedContainer = lib.mkEnableOption (lib.mdDoc '' additional configuration will be applied to the `systemd` instance running within the container as
Whether this LXC container will be running as a privileged container or not. If set to `true` then recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/).
additional configuration will be applied to the `systemd` instance running within the container as '';
recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/). };
'');
}; };
}; };