From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 22 Aug 2024 09:49:25 +0000 (+0200)
Subject: units: don't set LISTEN_FDNAMES for varlink services explicitly
X-Git-Tag: v257-rc1~621^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7c8d78e7f4c67064f8e934e2022a5a1a51f876c;p=thirdparty%2Fsystemd.git

units: don't set LISTEN_FDNAMES for varlink services explicitly

Now that FileDescriptorName= is properly honored by Accept=yes sockets,
this explicit override is pointless.
---

diff --git a/units/systemd-bootctl@.service b/units/systemd-bootctl@.service
index 5de61566380..3f49e104573 100644
--- a/units/systemd-bootctl@.service
+++ b/units/systemd-bootctl@.service
@@ -16,5 +16,4 @@ After=local-fs.target
 Before=shutdown.target
 
 [Service]
-Environment=LISTEN_FDNAMES=varlink
 ExecStart=bootctl
diff --git a/units/systemd-creds@.service b/units/systemd-creds@.service
index d565836d3ad..014444161f3 100644
--- a/units/systemd-creds@.service
+++ b/units/systemd-creds@.service
@@ -15,5 +15,4 @@ Conflicts=shutdown.target initrd-switch-root.target
 Before=shutdown.target initrd-switch-root.target
 
 [Service]
-Environment=LISTEN_FDNAMES=varlink
 ExecStart=-systemd-creds
diff --git a/units/systemd-pcrextend@.service.in b/units/systemd-pcrextend@.service.in
index 68b71d40687..79841a5fab1 100644
--- a/units/systemd-pcrextend@.service.in
+++ b/units/systemd-pcrextend@.service.in
@@ -16,5 +16,4 @@ Conflicts=shutdown.target initrd-switch-root.target
 Before=shutdown.target initrd-switch-root.target
 
 [Service]
-Environment=LISTEN_FDNAMES=varlink
 ExecStart=-{{LIBEXECDIR}}/systemd-pcrextend
diff --git a/units/systemd-pcrlock@.service.in b/units/systemd-pcrlock@.service.in
index 3528c565c8a..143d6c5154c 100644
--- a/units/systemd-pcrlock@.service.in
+++ b/units/systemd-pcrlock@.service.in
@@ -17,5 +17,4 @@ Before=sysinit.target shutdown.target
 After=systemd-remount-fs.service var.mount
 
 [Service]
-Environment=LISTEN_FDNAMES=varlink
 ExecStart={{LIBEXECDIR}}/systemd-pcrlock --location=770
diff --git a/units/systemd-sysext@.service b/units/systemd-sysext@.service
index 9dcbf9f1dd8..ec9c6b0d6db 100644
--- a/units/systemd-sysext@.service
+++ b/units/systemd-sysext@.service
@@ -16,5 +16,4 @@ Conflicts=shutdown.target initrd-switch-root.target
 Before=shutdown.target initrd-switch-root.target
 
 [Service]
-Environment=LISTEN_FDNAMES=varlink
 ExecStart=-systemd-sysext