From 55e918b43c001edd2a781c19fc7ed76139aa5fd1 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 18 Jun 2020 09:38:13 -0400 Subject: [PATCH] systemd: revised drop-in conf file handling see https://bugzilla.redhat.com/show_bug.cgi?id=1848208 systemd service file documentation still sucks rocks This is my current best guess, and at least it doesn't log errors Change-Id: Iec9847356090e561bfcd5f41a64b35c2e686a3d6 Signed-off-by: Kaleb S. KEITHLEY --- src/scripts/systemd/nfs-ganesha-lock.service.debian10 | 5 ++--- src/scripts/systemd/nfs-ganesha-lock.service.el8 | 5 ++--- src/scripts/systemd/rpc-statd.conf.debian10 | 2 +- src/scripts/systemd/rpc-statd.conf.el8 | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/scripts/systemd/nfs-ganesha-lock.service.debian10 b/src/scripts/systemd/nfs-ganesha-lock.service.debian10 index 67af058fe..53c19d5c6 100644 --- a/src/scripts/systemd/nfs-ganesha-lock.service.debian10 +++ b/src/scripts/systemd/nfs-ganesha-lock.service.debian10 @@ -17,9 +17,8 @@ [Unit] Before=nfs-ganesha.service -Conflicts=nfs-lock.service rpc-statd.service +Conflicts=nfs-lock.service [Service] -ExecStartPre= -ExecStopPost= +ExecStart=systemctl start rpc-statd.service diff --git a/src/scripts/systemd/nfs-ganesha-lock.service.el8 b/src/scripts/systemd/nfs-ganesha-lock.service.el8 index 67af058fe..53c19d5c6 100644 --- a/src/scripts/systemd/nfs-ganesha-lock.service.el8 +++ b/src/scripts/systemd/nfs-ganesha-lock.service.el8 @@ -17,9 +17,8 @@ [Unit] Before=nfs-ganesha.service -Conflicts=nfs-lock.service rpc-statd.service +Conflicts=nfs-lock.service [Service] -ExecStartPre= -ExecStopPost= +ExecStart=systemctl start rpc-statd.service diff --git a/src/scripts/systemd/rpc-statd.conf.debian10 b/src/scripts/systemd/rpc-statd.conf.debian10 index 2138f7467..d06fffd4c 100644 --- a/src/scripts/systemd/rpc-statd.conf.debian10 +++ b/src/scripts/systemd/rpc-statd.conf.debian10 @@ -13,7 +13,7 @@ After=nfs-config.service [Service] EnvironmentFile=-/run/sysconfig/nfs-utils Type=forking -PIDFile=/var/run/rpc.statd.pid +PIDFile=/run/rpc.statd.pid ExecStart=/sbin/rpc.statd --no-notify $STATDARGS [Install] diff --git a/src/scripts/systemd/rpc-statd.conf.el8 b/src/scripts/systemd/rpc-statd.conf.el8 index 6fec09af1..b67cfdf24 100644 --- a/src/scripts/systemd/rpc-statd.conf.el8 +++ b/src/scripts/systemd/rpc-statd.conf.el8 @@ -10,5 +10,5 @@ PartOf=nfs-utils.service [Service] Environment=RPC_STATD_NO_NOTIFY=1 Type=forking -PIDFile=/var/run/rpc.statd.pid +PIDFile=/run/rpc.statd.pid ExecStart=/usr/sbin/rpc.statd -- 2.26.2