sysinit.target: Don't depend on systemd-tmpfiles-setup.service
systemd-tmpfiles-setup.service pulls in local-fs.target, which interferes with NixOps' send-keys feature (since sshd.service depends indirectly on sysinit.target). Since in NixOS we don't use systemd-tmpfiles for creating files (that's done by activation scripts and preStart scripts), it's not a problem to start it a bit later. Backport: 14.04
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
|
||||
, kexectools, libmicrohttpd, linuxHeaders
|
||||
, python ? null, pythonSupport ? false
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
assert stdenv.isLinux;
|
||||
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
|
||||
[ pkgconfig intltool gperf libcap kmod xz pam acl
|
||||
/* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
|
||||
libmicrohttpd linuxHeaders
|
||||
autoreconfHook
|
||||
] ++ stdenv.lib.optional pythonSupport python;
|
||||
|
||||
configureFlags =
|
||||
|
||||
Reference in New Issue
Block a user