Unverified Commit 784bf5dd authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

Merge pull request #260589 from adamcstephens/lxd/udev-trigger

parents a97d85ff dbeeeb8e
Loading
Loading
Loading
Loading
+12 −9
Original line number Diff line number Diff line
@@ -9,15 +9,16 @@ in {

  options = {
    virtualisation.lxc = {
      privilegedContainer = lib.mkOption {
        type = lib.types.bool;
        default = false;
        description = lib.mdDoc ''
      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/).
        '';
      };
      '');
    };
  };

@@ -68,6 +69,8 @@ in {
      ln -fs "$1/init" /sbin/init
    '';

    systemd.additionalUpstreamSystemUnits = lib.mkIf cfg.nestedContainer ["systemd-udev-trigger.service"];

    # Add the overrides from lxd distrobuilder
    # https://github.com/lxc/distrobuilder/blob/05978d0d5a72718154f1525c7d043e090ba7c3e0/distrobuilder/main.go#L630
    systemd.packages = [