- unify systemd service names with SysV to ease transition

Changed files:
    nfs-gssd.service -> 1.4
    nfs-lock.service -> 1.4
    nfs-mountd.service -> 1.3
    nfs-svcgssd.service -> 1.3
    nfs-utils.spec -> 1.225
    nfsd.service -> 1.4

diff --git a/nfs-gssd.service b/nfs-gssd.service
index 88671cfc5e1284b32189a7cb46ee922d5f92c190..eb55bf2b7bf06c973f19753a5a2acb706e2020a0 100644 (file)
--- a/nfs-gssd.service
+++ b/nfs-gssd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=NFS client GSSAPI daemon
 Requires=var-lib-nfs-rpc_pipefs.mount
-After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-idmapd.service
+After=syslog.target var-lib-nfs-rpc_pipefs.mount idmapd.service
 
 [Service]
 Type=forking

diff --git a/nfs-lock.service b/nfs-lock.service
index 335cde95c228e86986be996d9671ccbfa244fd6a..3f30c84b515b9981c0c556359297cf85502cb2a8 100644 (file)
--- a/nfs-lock.service
+++ b/nfs-lock.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=NFS file locking service
 Requires=rpcbind.service network.target
-After=network.target named.service rpcbind.service nfs-blkmapd.service nfs-idmapd.service nfsd.service
+After=network.target named.service rpcbind.service blkmapd.service idmapd.service nfsd.service
 
 [Service]
 Type=forking
 StandardError=syslog+console
 EnvironmentFile=-/etc/sysconfig/nfslock
-ExecStartPre=/usr/share/nfs-utils/nfs-lock.preconfig
+ExecStartPre=/usr/share/nfs-utils/nfslock.preconfig
 ExecStart=/sbin/rpc.statd $STATDOPTIONS
 # Make sure lockd's ports are reset
 ExecStopPost=-/sbin/sysctl -w fs.nfs.nlm_tcpport=0 fs.nfs.nlm_udpport=0

diff --git a/nfs-mountd.service b/nfs-mountd.service
index dd09103c38ded86add8876773d2a4491a9aa6df8..ac82521538f2be0766825379481633c4b51444f6 100644 (file)
--- a/nfs-mountd.service
+++ b/nfs-mountd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=NFS server mount daemon
-Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service nfs-exportfs.service
-After=network.target named.service rpcbind.service proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount nfs-exportfs.service
+Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service nfsd-exportfs.service
+After=network.target named.service rpcbind.service proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount nfsd-exportfs.service
 
 [Service]
 Type=forking

diff --git a/nfs-svcgssd.service b/nfs-svcgssd.service
index c5bc49612b14827b9742bd0e5b8621f9d5c1ecda..a58b69ab0978fe2bd11206167d784295b52a373b 100644 (file)
--- a/nfs-svcgssd.service
+++ b/nfs-svcgssd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=NFS server GSSAPI daemon
 Requires=var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount
-After=syslog.target var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount rpcbind.service nfs-idmapd.service 
+After=syslog.target var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount rpcbind.service idmapd.service 
 
 [Service]
 Type=forking

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 329a15375b3d24f9e4518c910d523963caa8cf2c..327a2e22ab64ce1048a80775540857ecf5132212 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -292,16 +292,20 @@ install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 install %{SOURCE100} $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
 install %{SOURCE101} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
 install %{SOURCE102} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd.service
-install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-blkmapd.service
-install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-exportfs.service
-install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-gssd.service
-install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-idmapd.service
-install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-lock.service
-install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-mountd.service
-install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-svcgssd.service
+install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/blkmapd.service
+install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-exportfs.service
+install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/gssd.service
+install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/idmapd.service
+install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfslock.service
+install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-mountd.service
+install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/svcgssd.service
 install %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.postconfig
 install %{SOURCE111} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.preconfig
-install %{SOURCE112} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfs-lock.preconfig
+install %{SOURCE112} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfslock.preconfig
+
+# Disable old SysV service for systemd installs
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/nfs.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/nfsfs.service
 
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
@@ -340,15 +344,15 @@ fi
 
 %post systemd
 %systemd_post nfsd.service
-%systemd_post nfs-exportfs.service
-%systemd_post nfs-mountd.service
-%systemd_post nfs-svcgssd.service
+%systemd_post nfsd-exportfs.service
+%systemd_post nfsd-mountd.service
+%systemd_post svcgssd.service
 
 %preun systemd
 %systemd_preun nfsd.service
-%systemd_preun nfs-exportfs.service
-%systemd_preun nfs-mountd.service
-%systemd_preun nfs-svcgssd.service
+%systemd_preun nfsd-exportfs.service
+%systemd_preun nfsd-mountd.service
+%systemd_preun svcgssd.service
 
 %postun systemd
 %systemd_reload
@@ -372,12 +376,12 @@ if [ "$1" = "0" ]; then
 fi
 
 %post clients-systemd
-%systemd_post nfs-blkmapd.service
-%systemd_post nfs-gssd.service
+%systemd_post blkmapd.service
+%systemd_post gssd.service
 
 %preun clients-systemd
-%systemd_preun nfs-blkmapd.service
-%systemd_preun nfs-gssd.service
+%systemd_preun blkmapd.service
+%systemd_preun gssd.service
 
 %postun clients-systemd
 %systemd_reload
@@ -407,12 +411,12 @@ if [ "$1" = "0" ]; then
 fi
 
 %post common-systemd
-%systemd_post nfs-idmapd.service
-%systemd_post nfs-lock.service
+%systemd_post idmapd.service
+%systemd_post nfslock.service
 
 %preun common-systemd
-%systemd_preun nfs-idmapd.service
-%systemd_preun nfs-lock.service
+%systemd_preun idmapd.service
+%systemd_preun nfslock.service
 
 %postun common-systemd
 %systemd_reload
@@ -488,10 +492,11 @@ fi
 
 %files systemd
 %defattr(644,root,root,755)
+%{systemdunitdir}/nfs.service
 %{systemdunitdir}/nfsd.service
-%{systemdunitdir}/nfs-exportfs.service
-%{systemdunitdir}/nfs-mountd.service
-%{systemdunitdir}/nfs-svcgssd.service
+%{systemdunitdir}/nfsd-exportfs.service
+%{systemdunitdir}/nfsd-mountd.service
+%{systemdunitdir}/svcgssd.service
 %{systemdunitdir}/proc-fs-nfsd.mount
 %attr(755,root,root) %{_datadir}/nfs-utils/nfsd.postconfig
 %attr(755,root,root) %{_datadir}/nfs-utils/nfsd.preconfig
@@ -524,8 +529,9 @@ fi
 
 %files clients-systemd
 %defattr(644,root,root,755)
-%{systemdunitdir}/nfs-blkmapd.service
-%{systemdunitdir}/nfs-gssd.service
+%{systemdunitdir}/nfsfs.service
+%{systemdunitdir}/blkmapd.service
+%{systemdunitdir}/gssd.service
 
 %files common
 %defattr(644,root,root,755)
@@ -557,8 +563,8 @@ fi
 
 %files common-systemd
 %defattr(644,root,root,755)
-%{systemdunitdir}/nfs-idmapd.service
-%{systemdunitdir}/nfs-lock.service
+%{systemdunitdir}/idmapd.service
+%{systemdunitdir}/nfslock.service
 %{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
 %dir %{_datadir}/nfs-utils
-%attr(755,root,root) %{_datadir}/nfs-utils/nfs-lock.preconfig
+%attr(755,root,root) %{_datadir}/nfs-utils/nfslock.preconfig

diff --git a/nfsd.service b/nfsd.service
index cdccca299905265d351ac31bb6a6233f12d68e78..bdc34471d3f7d2f77e7321cababef742894cf4d4 100644 (file)
--- a/nfsd.service
+++ b/nfsd.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=NFS Server
-Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service nfs-exportfs.service
-After=network.target named.service rpcbind.service rquotad.service proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount nfs-exportfs.service nfs-mountd.service
+Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service nfsd-exportfs.service
+After=network.target named.service rpcbind.service rquotad.service proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount nfsd-exportfs.service nfsd-mountd.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=true
 StandardError=syslog+console
 EnvironmentFile=-/etc/sysconfig/nfsd
-ExecStartPre=-/usr/share/nfs-utils/nfs-lock.preconfig
+ExecStartPre=-/usr/share/nfs-utils/nfslock.preconfig
 ExecStartPre=/usr/share/nfs-utils/nfsd.preconfig
 ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDOPTIONS $RPCNFSDCOUNT
 ExecStartPost=-/usr/share/nfs-utils/nfsd.postconfig