Browse code

nfs-utils : copied nfs-server.service and nfs-mountd.service from 2.0 branch. Removed nfs-idmapd.service dependency from nfs-server.service because photon-utils is built without nfs4 support (bug 2039594).

Change-Id: I49b27659671596603109de21ed5270d75406e731
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4831
Reviewed-by: Dheeraj S Shetty <dheerajs@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Xiaolin Li authored on 2018/02/28 09:36:06
Showing 3 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,12 @@
0
+[Unit]
1
+Description=NFS Mount Daemon
2
+DefaultDependencies=no
3
+Requires=proc-fs-nfsd.mount
4
+After=proc-fs-nfsd.mount
5
+After=network.target local-fs.target
6
+BindsTo=nfs-server.service
7
+
8
+[Service]
9
+Type=forking
10
+EnvironmentFile=/etc/default/nfs-utils
11
+ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS
0 12
new file mode 100644
... ...
@@ -0,0 +1,28 @@
0
+[Unit]
1
+Description=NFS server and services
2
+DefaultDependencies=no
3
+Requires= network.target proc-fs-nfsd.mount
4
+Requires= nfs-mountd.service
5
+Wants=rpcbind.socket
6
+Wants=rpc-statd.service
7
+Wants=rpc-statd-notify.service
8
+
9
+After= local-fs.target
10
+After= network.target proc-fs-nfsd.mount rpcbind.socket nfs-mountd.service
11
+After= nfs-idmapd.service rpc-statd.service
12
+Before= rpc-statd-notify.service
13
+
14
+[Service]
15
+Type=oneshot
16
+RemainAfterExit=yes
17
+EnvironmentFile=/etc/default/nfs-utils
18
+ExecStartPre=/usr/sbin/exportfs -r
19
+ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS
20
+ExecStop=/usr/sbin/rpc.nfsd 0
21
+ExecStopPost=/usr/sbin/exportfs -au
22
+ExecStopPost=/usr/sbin/exportfs -f
23
+
24
+ExecReload=/usr/sbin/exportfs -r
25
+
26
+[Install]
27
+WantedBy=multi-user.target
... ...
@@ -1,17 +1,19 @@
1
-Summary:    NFS client utils
2
-Name:       nfs-utils
3
-Version:    1.3.3
4
-Release:    6%{?dist}
5
-License:    GPLv2+
6
-URL:        http://sourceforge.net/projects/nfs
7
-Group:      Applications/Nfs-utils-client
8
-Source0:    http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
9
-%define sha1 nfs-utils=7c561e6a22a626aed93766bdb0c34e9a4e77b9e7
10
-Source1:    nfs-client.service
11
-Source2:    nfs-client.target
12
-Source3:    rpc-statd.service
13
-Source4:    rpc-statd-notify.service
14
-Source5:    nfs-utils.defaults
1
+Summary:        NFS client utils
2
+Name:           nfs-utils
3
+Version:        1.3.3
4
+Release:        7%{?dist}
5
+License:        GPLv2+
6
+URL:            http://sourceforge.net/projects/nfs
7
+Group:          Applications/Nfs-utils-client
8
+Source0:        http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
9
+%define sha1    nfs-utils=7c561e6a22a626aed93766bdb0c34e9a4e77b9e7
10
+Source1:        nfs-client.service
11
+Source2:        nfs-client.target
12
+Source3:        rpc-statd.service
13
+Source4:        rpc-statd-notify.service
14
+Source5:        nfs-utils.defaults
15
+Source6:        nfs-server.service
16
+Source7:        nfs-mountd.service
15 17
 Vendor:     VMware, Inc.
16 18
 Distribution:   Photon
17 19
 BuildRequires:  krb5
... ...
@@ -49,9 +51,9 @@ install -m644 %{SOURCE2} %{buildroot}/lib/systemd/system/
49 49
 install -m644 %{SOURCE3} %{buildroot}/lib/systemd/system/
50 50
 install -m644 %{SOURCE4} %{buildroot}/lib/systemd/system/
51 51
 install -m644 %{SOURCE5} %{buildroot}/etc/default/nfs-utils
52
-install -m644 systemd/nfs-server.service %{buildroot}/lib/systemd/system/
52
+install -m644 %{SOURCE6} %{buildroot}/lib/systemd/system/
53
+install -m644 %{SOURCE7} %{buildroot}/lib/systemd/system/
53 54
 install -m644 systemd/proc-fs-nfsd.mount %{buildroot}/lib/systemd/system/
54
-install -m644 systemd/nfs-mountd.service %{buildroot}/lib/systemd/system/
55 55
 
56 56
 %files
57 57
 %defattr(-,root,root)
... ...
@@ -64,6 +66,8 @@ install -m644 systemd/nfs-mountd.service %{buildroot}/lib/systemd/system/
64 64
 /lib/systemd/system/*
65 65
 
66 66
 %changelog
67
+*   Tue Feb 27 2018 Xiaolin Li <xiaolinl@vmware.com> 1.3.3-7
68
+-   Updated nfs-server.service and nfs-mountd.service.
67 69
 *   Wed Jun 28 2017 Kumar Kaushik <kaushikk@vmware.com> 1.3.3-6
68 70
 -   Removed requires python2-libs
69 71
 *   Fri Jun 23 2017 Divya Thaluru <dthaluru@vmware.com> 1.3.3-5