systemd: Update to 190
This commit is contained in:
parent
50aac3247a
commit
7057acb322
@ -1,23 +1,23 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
|
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
|
||||||
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
|
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
|
||||||
, glib, kbd
|
, glib, kbd, libxslt
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert stdenv.gcc.libc or null != null;
|
assert stdenv.gcc.libc or null != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "systemd-188";
|
name = "systemd-190";
|
||||||
|
|
||||||
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 = "0nr1cg1mizbwcafjcqw3c30mx6xdv596jpbgjlxr6myvc5hfsfg8";
|
sha256 = "1p3pf8gvx43g62l9x85l8ym12wc373cmaysi41sahjndp2agicig";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./fail-after-reaching-respawn-limit.patch ];
|
patches = [ ./name_to_handle_at.patch ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl
|
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl
|
||||||
/* cryptsetup */ libuuid m4 usbutils pciutils glib
|
/* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
|
|
21
pkgs/os-specific/linux/systemd/name_to_handle_at.patch
Normal file
21
pkgs/os-specific/linux/systemd/name_to_handle_at.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff --git a/src/shared/missing.h b/src/shared/missing.h
|
||||||
|
index c5bb71a..14abe4e 100644
|
||||||
|
--- a/src/shared/missing.h
|
||||||
|
+++ b/src/shared/missing.h
|
||||||
|
@@ -209,12 +209,12 @@ static inline pid_t gettid(void) {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __x86_64__
|
||||||
|
-# ifndef __NR_name_to_handle
|
||||||
|
-# define __NR_name_to_handle 303
|
||||||
|
+# ifndef __NR_name_to_handle_at
|
||||||
|
+# define __NR_name_to_handle_at 303
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
-# ifndef __NR_name_to_handle
|
||||||
|
-# define __NR_name_to_handle 341
|
||||||
|
+# ifndef __NR_name_to_handle_at
|
||||||
|
+# define __NR_name_to_handle_at 341
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user