Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 361bd591ea4a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2d2ab94cd2c7
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 22, 2018

  1. kernel: enable CGROUP_NET_PRIO 

    It's required by systemd 238 because of a bug, otherwise systemd aborts.

(cherry picked from commit e31c3f8)
    @abbradar @fpletz
    abbradar authored and fpletz committed Mar 22, 2018
    Copy the full SHA
    01cce78 View commit details

  2. systemd: 237 -> 238 

    (cherry picked from commit 0ccab49)
    @abbradar @fpletz
    abbradar authored and fpletz committed Mar 22, 2018
    Copy the full SHA
    2d2ab94 View commit details
Showing with 6 additions and 12 deletions.
  1. +2 −2 nixos/modules/system/boot/systemd.nix
  2. +1 −0 pkgs/os-specific/linux/kernel/common-config.nix
  3. +3 −10 pkgs/os-specific/linux/systemd/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/system/boot/systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
];

1 change: 1 addition & 0 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -135,6 +135,7 @@ with stdenv.lib;
NETFILTER y
NETFILTER_ADVANCED y
CGROUP_BPF? y # Required by systemd per-cgroup firewalling
CGROUP_NET_PRIO y # Required by systemd
IP_ROUTE_VERBOSE y
IP_MROUTE_MULTIPLE_TABLES y
IP_VS_PROTO_TCP y
13 changes: 3 additions & 10 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,14 +17,14 @@ let
pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);

in stdenv.mkDerivation rec {
version = "237";
version = "238";
name = "systemd-${version}";

src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
rev = "98067cc806ae0d2759cdd2334f230cd8548e5317";
sha256 = "077svfs2xy3g30s62q69wcv5pb9vfhzh8i7lhfri73vvhwbpzd5q";
rev = "243d65d38f2df82d4a39f6a9970337803dff65a1";
sha256 = "098hxlkh6q17rxa178adylksxnnd4x9rxb8amjnlbiydcc6kaa5n";
};

outputs = [ "out" "lib" "man" "dev" ];
@@ -168,13 +168,6 @@ in stdenv.mkDerivation rec {
rm -rf $out/etc/systemd/system
# Install SysV compatibility commands.
mkdir -p $out/sbin
ln -s $out/lib/systemd/systemd $out/sbin/telinit
for i in init halt poweroff runlevel reboot shutdown; do
ln -s $out/bin/systemctl $out/sbin/$i
done
# Fix reference to /bin/false in the D-Bus services.
for i in $out/share/dbus-1/system-services/*.service; do
substituteInPlace $i --replace /bin/false ${coreutils}/bin/false