Unverified Commit 70ca21d3 authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

systemd: v257.9 -> v258 (#427968)

parents d3736636 506887da

nixos/modules/config/users-groups.nix

+2 −0
Original line number Diff line number Diff line
@@ -871,6 +871,7 @@ in 
        render.gid = ids.gids.render;

        sgx.gid = ids.gids.sgx;

        shadow.gid = ids.gids.shadow;

        clock.gid = ids.gids.clock;

      };



      system.activationScripts.users =
@@ -1033,6 +1034,7 @@ in 
          cdrom = { };

          tape = { };

          kvm = { };

          clock = { };

        };

      };

nixos/modules/misc/ids.nix

+1 −0
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ in 
      rstudio-server = 324;

      localtimed = 325;

      automatic-timezoned = 326;

      clock = 327;



      # When adding a gid, make sure it doesn't match an existing

      # uid. Users and groups with the same name should have equal

nixos/modules/services/hardware/udev.nix

+3 −1
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ let 
        for i in $packages; do

          echo "Adding hwdb files for package $i"

          for j in $i/{etc,lib}/udev/hwdb.d/*; do

            ln -s $j etc/udev/hwdb.d/$(basename $j)

            # This must be a copy, not a symlink, because --root below will chase links within the root argument.

            cp $j etc/udev/hwdb.d/$(basename $j)

          done

        done
@@ -461,6 +462,7 @@ in 
      "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"

      "${config.boot.initrd.systemd.package}/lib/udev/ata_id"

      "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"

      "${config.boot.initrd.systemd.package}/lib/udev/dmi_memory_id"

      "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"

      "${config.boot.initrd.systemd.package}/lib/udev/rules.d"

    ]

nixos/modules/system/boot/systemd/journald.nix

+5 −2
Original line number Diff line number Diff line
@@ -79,8 +79,11 @@ in 
    };



    services.journald.audit = lib.mkOption {

      default = null;

      type = lib.types.nullOr lib.types.bool;

      default = "keep";

      type = lib.types.oneOf [

        lib.types.bool

        (lib.types.enum [ "keep" ])

      ];

      description = ''

        If enabled systemd-journald will turn on auditing on start-up.

        If disabled it will turn it off. If unset it will neither enable nor disable it, leaving the previous state unchanged.

nixos/modules/system/boot/systemd/oomd.nix

+0 −4
Original line number Diff line number Diff line
@@ -50,10 +50,6 @@ in 
      "systemd-oomd.socket"

    ];



    systemd.services.systemd-oomd.after = [

      "swap.target" # TODO: drop after systemd v258

      "systemd-sysusers.service" # TODO: drop after systemd v257.8

    ];

    systemd.services.systemd-oomd.wantedBy = [ "multi-user.target" ];



    environment.etc."systemd/oomd.conf".text = utils.systemdUtils.lib.settingsToSections cfg.settings;