summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-11-30 23:43:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-08 10:31:30 +0000
commitf46e54c7c9069f8d84483e1ba4cadaa4300c3e18 (patch)
tree8ad6d1ac2e446b70490e0ead731e30b6d851dfae /meta/recipes-connectivity
parenta6ae43003adfaff38d6b540672a1511fee53eb2d (diff)
downloadpoky-f46e54c7c9069f8d84483e1ba4cadaa4300c3e18.tar.gz
nfs-utils: sync systemd unit files with nfs-utils.git
nfs-server failed to start after installation from a package feed. (From OE-Core rev: c4d276f9f639a1a534789de12a4783ae931e6aa4) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service7
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service11
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service9
3 files changed, 18 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
index 28b7388f67..27ea58d366 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -1,7 +1,10 @@
1[Unit] 1[Unit]
2Description=NFS Mount Daemon 2Description=NFS Mount Daemon
3After=rpcbind.service nfs-server.service 3DefaultDependencies=no
4Requires=rpcbind.service nfs-server.service 4Requires=proc-fs-nfsd.mount
5After=proc-fs-nfsd.mount
6After=network.target local-fs.target
7BindsTo=nfs-server.service
5ConditionPathExists=@SYSCONFDIR@/exports 8ConditionPathExists=@SYSCONFDIR@/exports
6 9
7[Service] 10[Service]
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
index b9dfe74273..6481377d80 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -1,7 +1,11 @@
1[Unit] 1[Unit]
2Description=NFS Server 2Description=NFS server and services
3Requires=rpcbind.service nfs-mountd.service 3DefaultDependencies=no
4After=rpcbind.service 4Requires=network.target proc-fs-nfsd.mount
5Requires=nfs-mountd.service
6Wants=rpcbind.service
7After=local-fs.target
8After=network.target proc-fs-nfsd.mount rpcbind.service nfs-mountd.service
5ConditionPathExists=@SYSCONFDIR@/exports 9ConditionPathExists=@SYSCONFDIR@/exports
6 10
7[Service] 11[Service]
@@ -10,6 +14,7 @@ EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
10ExecStartPre=@SBINDIR@/exportfs -r 14ExecStartPre=@SBINDIR@/exportfs -r
11ExecStart=@SBINDIR@/rpc.nfsd $NFSD_OPTS $NFSD_COUNT 15ExecStart=@SBINDIR@/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
12ExecStop=@SBINDIR@/rpc.nfsd 0 16ExecStop=@SBINDIR@/rpc.nfsd 0
17ExecStopPost=@SBINDIR@/exportfs -au
13ExecStopPost=@SBINDIR@/exportfs -f 18ExecStopPost=@SBINDIR@/exportfs -f
14ExecReload=@SBINDIR@/exportfs -r 19ExecReload=@SBINDIR@/exportfs -r
15StandardError=syslog 20StandardError=syslog
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
index 746dacf056..6e196b8c8c 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
@@ -1,8 +1,9 @@
1[Unit] 1[Unit]
2Description=NFS file locking service 2Description=NFS status monitor for NFSv2/3 locking.
3After=rpcbind.service 3DefaultDependencies=no
4Requires=rpcbind.service 4Conflicts=umount.target
5Before=remote-fs-pre.target 5Requires=nss-lookup.target rpcbind.service
6After=network.target nss-lookup.target rpcbind.service
6 7
7[Service] 8[Service]
8EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf 9EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf