public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: Update to 188

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-09 10:51:48 -04:00
parent aa5220c701
commit 1966010ec7
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/systemd/default.nix
View File

@ -6,13 +6,15 @@
assert stdenv.gcc.libc or null != null; assert stdenv.gcc.libc or null != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "systemd-187"; name = "systemd-188";
src = fetchurl { src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
sha256 = "1m7fzcqqgwqdjrrdp41i81q6y0cgjbknrznsvjqwh7nc027k6fqs"; sha256 = "0nr1cg1mizbwcafjcqw3c30mx6xdv596jpbgjlxr6myvc5hfsfg8";
}; };
patches = [ ./fail-after-reaching-respawn-limit.patch ];
buildInputs = buildInputs =
[ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl [ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl
cryptsetup libuuid m4 usbutils pciutils glib cryptsetup libuuid m4 usbutils pciutils glib
@ -47,7 +49,8 @@ stdenv.mkDerivation rec {
done done
''; '';
NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\""; # ‘-fstack-protector’ is necessary to build the PAM module correctly.
NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fstack-protector";
makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include";
@ -64,12 +67,12 @@ stdenv.mkDerivation rec {
mkdir -p $out/sbin mkdir -p $out/sbin
ln -s $out/lib/systemd/systemd $out/sbin/telinit ln -s $out/lib/systemd/systemd $out/sbin/telinit
for i in init halt poweroff runlevel reboot shutdown; do for i in init halt poweroff runlevel reboot shutdown; do
ln -s $out/bin/systemctl $out/sbin/$i ln -s $out/bin/systemctl $out/sbin/$i
done done
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
# The interface version prevents NixOS from switching to an # The interface version prevents NixOS from switching to an
# incompatible systemd at runtime. (Switching across reboots is # incompatible systemd at runtime. (Switching across reboots is
# fine, of course.) It should be increased whenever systemd changes # fine, of course.) It should be increased whenever systemd changes

12
pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/core/service.c b/src/core/service.c
index 1c127bd..eafdbe5 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2487,6 +2487,7 @@ static int service_start(Unit *u) {
r = service_start_limit_test(s);
if (r < 0) {
service_notify_sockets_dead(s, true);
+ service_set_state(s, SERVICE_FAILED);
return r;
}