1From da528d5d60137f13202102b53cf178aba45849a5 Mon Sep 17 00:00:00 2001
2From: Stefan Agner <stefan.agner@toradex.com>
3Date: Sun, 6 Oct 2019 00:05:54 +0200
4Subject: [PATCH] systemd: use EnvironmentFile
5
6Use OE specific environment file.
7
8Upstream-Status: Inappropriate [OE specific]
9Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
10---
11 configure.ac               | 2 ++
12 systemd/rpcbind.service.in | 2 +-
13 2 files changed, 3 insertions(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index 2dd9471..47a46c0 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -69,5 +69,7 @@ AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
20 # 2 "evals" needed to expand variable names
21 AC_SUBST([_sbindir])
22 AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
23+AC_SUBST([_sysconfdir])
24+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir])
25
26 AC_OUTPUT([Makefile systemd/rpcbind.service])
27diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
28index 7b1c74b..f45ee1e 100644
29--- a/systemd/rpcbind.service.in
30+++ b/systemd/rpcbind.service.in
31@@ -11,7 +11,7 @@ Wants=rpcbind.target
32
33 [Service]
34 Type=notify
35-# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
36+EnvironmentFile=-@_sysconfdir@/rpcbind.conf
37 ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
38
39 [Install]
40--
412.23.0
42
43