Unverified Commit 2e8016c5 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #257852: systemd: revert allow udev-trigger for lxd nested containers

parents f0cf83a1 b1237da5

nixos/modules/system/boot/systemd.nix

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ let 
      "systemd-udevd-kernel.socket"

      "systemd-udevd.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

      # "systemd-hwdb-update.service"

nixos/modules/virtualisation/lxc-container.nix

+9 −10
Original line number Diff line number Diff line
@@ -9,16 +9,15 @@ in { 


  options = {

    virtualisation.lxc = {

      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 ''

      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/).

      '');

        '';

      };

    };

  };