mirror of
https://git.yoctoproject.org/poky
synced 2026-03-03 22:09:39 +01:00
63dd6190cb
Use upstream systemd service files instead of our own service files. This also makes sure that /run/rpcbind.sock is used which fixes the following systemd warning: /usr/lib/systemd/system/rpcbind.socket:5: ListenStream= references a path below legacy directory /var/run/, updating /var/run/rpcbind.sock \xe2\x86\x92 /run/rpcbind.sock; please update the unit file accordingly. (From OE-Core rev: ad08385393bb0d072f2f27f5a189041037e06195) Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From da528d5d60137f13202102b53cf178aba45849a5 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Agner <stefan.agner@toradex.com>
|
|
Date: Sun, 6 Oct 2019 00:05:54 +0200
|
|
Subject: [PATCH] systemd: use EnvironmentFile
|
|
|
|
Use OE specific environment file.
|
|
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
|
---
|
|
configure.ac | 2 ++
|
|
systemd/rpcbind.service.in | 2 +-
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 2dd9471..47a46c0 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -69,5 +69,7 @@ AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
|
|
# 2 "evals" needed to expand variable names
|
|
AC_SUBST([_sbindir])
|
|
AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
|
|
+AC_SUBST([_sysconfdir])
|
|
+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sbindir])
|
|
|
|
AC_OUTPUT([Makefile systemd/rpcbind.service])
|
|
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
|
|
index 7b1c74b..f45ee1e 100644
|
|
--- a/systemd/rpcbind.service.in
|
|
+++ b/systemd/rpcbind.service.in
|
|
@@ -11,7 +11,7 @@ Wants=rpcbind.target
|
|
|
|
[Service]
|
|
Type=notify
|
|
-# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
|
|
+EnvironmentFile=-@_sysconfdir@/rpcbind.conf
|
|
ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
|
|
|
[Install]
|
|
--
|
|
2.23.0
|
|
|