diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-23 01:11:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-23 01:11:32 +0300 |
| commit | 91072b7b23eae18c7be986d44f47c6e3dfe4ce92 (patch) | |
| tree | c7c9a6d3341efe3ddc30f9dfc285fc2831bb1681 /nixos | |
| parent | e5ab8585e4cbd8b66e5033c09d7d00eb16582a2f (diff) | |
| parent | 0ccab4946d5d0405ebced50a7b7f847730d502a9 (diff) | |
| download | nixpkgs-91072b7b23eae18c7be986d44f47c6e3dfe4ce92.tar nixpkgs-91072b7b23eae18c7be986d44f47c6e3dfe4ce92.tar.gz nixpkgs-91072b7b23eae18c7be986d44f47c6e3dfe4ce92.tar.bz2 nixpkgs-91072b7b23eae18c7be986d44f47c6e3dfe4ce92.tar.lz nixpkgs-91072b7b23eae18c7be986d44f47c6e3dfe4ce92.tar.xz nixpkgs-91072b7b23eae18c7be986d44f47c6e3dfe4ce92.tar.zst nixpkgs-91072b7b23eae18c7be986d44f47c6e3dfe4ce92.zip | |
Merge pull request #37647 from abbradar/systemd-238
[WIP] Update systemd and unbreak staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 92c9ee0c469..2391e85f9f7 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -137,7 +137,6 @@ let # Slices / containers. "slices.target" - "system.slice" "user.slice" "machine.slice" "machines.target" @@ -821,7 +820,8 @@ in system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET" - "SYSFS" "PROC_FS" "FHANDLE" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" + "SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC" + "CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" "TMPFS_XATTR" "SECCOMP" ]; |