Merge pull request #94356 from flokli/systemd-disable-remote

systemd: disable remote support
This commit is contained in:
Eelco Dolstra 2020-07-31 19:14:19 +02:00 committed by GitHub
commit 941aec472e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap { stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap
, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, utillinux, libffi , curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
, audit, lz4, bzip2, libmicrohttpd, pcre2 , audit, lz4, bzip2, pcre2
, linuxHeaders ? stdenv.cc.libc.linuxHeaders , linuxHeaders ? stdenv.cc.libc.linuxHeaders
, iptables, gnu-efi, bashInteractive , iptables, gnu-efi, bashInteractive
, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
@ -90,7 +90,7 @@ in stdenv.mkDerivation {
buildInputs = buildInputs =
[ linuxHeaders libcap curl.dev kmod xz pam acl [ linuxHeaders libcap curl.dev kmod xz pam acl
/* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
libmicrohttpd pcre2 ] ++ pcre2 ] ++
stdenv.lib.optional withKexectools kexectools ++ stdenv.lib.optional withKexectools kexectools ++
stdenv.lib.optional withLibseccomp libseccomp ++ stdenv.lib.optional withLibseccomp libseccomp ++
[ libffi audit lz4 bzip2 libapparmor [ libffi audit lz4 bzip2 libapparmor
@ -120,6 +120,7 @@ in stdenv.mkDerivation {
"-Dhostnamed=true" "-Dhostnamed=true"
"-Dnetworkd=true" "-Dnetworkd=true"
"-Dportabled=false" "-Dportabled=false"
"-Dremote=false"
"-Dsysusers=false" "-Dsysusers=false"
"-Dtimedated=true" "-Dtimedated=true"
"-Dtimesyncd=true" "-Dtimesyncd=true"