packages: nfs-utils/nfs-gssd.service, nfs-utils/nfs-lock.service, nfs-utils...

baggins baggins at pld-linux.org
Fri Jan 20 20:04:47 CET 2012 

Author: baggins                      Date: Fri Jan 20 19:04:47 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify systemd service names with SysV to ease transition

---- Files affected:
packages/nfs-utils:
   nfs-gssd.service (1.3 -> 1.4) , nfs-lock.service (1.3 -> 1.4) , nfs-mountd.service (1.2 -> 1.3) , nfs-svcgssd.service (1.2 -> 1.3) , nfs-utils.spec (1.224 -> 1.225) , nfsd.service (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/nfs-utils/nfs-gssd.service
diff -u packages/nfs-utils/nfs-gssd.service:1.3 packages/nfs-utils/nfs-gssd.service:1.4
--- packages/nfs-utils/nfs-gssd.service:1.3	Thu Jan 19 12:12:20 2012
+++ packages/nfs-utils/nfs-gssd.service	Fri Jan 20 20:04:42 2012
@@ -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

================================================================
Index: packages/nfs-utils/nfs-lock.service
diff -u packages/nfs-utils/nfs-lock.service:1.3 packages/nfs-utils/nfs-lock.service:1.4
--- packages/nfs-utils/nfs-lock.service:1.3	Thu Jan 19 12:12:20 2012
+++ packages/nfs-utils/nfs-lock.service	Fri Jan 20 20:04:42 2012
@@ -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

================================================================
Index: packages/nfs-utils/nfs-mountd.service
diff -u packages/nfs-utils/nfs-mountd.service:1.2 packages/nfs-utils/nfs-mountd.service:1.3
--- packages/nfs-utils/nfs-mountd.service:1.2	Thu Jan 19 12:12:20 2012
+++ packages/nfs-utils/nfs-mountd.service	Fri Jan 20 20:04:42 2012
@@ -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

================================================================
Index: packages/nfs-utils/nfs-svcgssd.service
diff -u packages/nfs-utils/nfs-svcgssd.service:1.2 packages/nfs-utils/nfs-svcgssd.service:1.3
--- packages/nfs-utils/nfs-svcgssd.service:1.2	Thu Jan 19 12:12:20 2012
+++ packages/nfs-utils/nfs-svcgssd.service	Fri Jan 20 20:04:42 2012
@@ -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

================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u packages/nfs-utils/nfs-utils.spec:1.224 packages/nfs-utils/nfs-utils.spec:1.225
--- packages/nfs-utils/nfs-utils.spec:1.224	Thu Jan 19 21:08:18 2012
+++ packages/nfs-utils/nfs-utils.spec	Fri Jan 20 20:04:42 2012
@@ -293,16 +293,20 @@
 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
@@ -341,15 +345,15 @@
 
 %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
@@ -373,12 +377,12 @@
 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
@@ -408,12 +412,12 @@
 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
@@ -489,10 +493,11 @@
 
 %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
@@ -525,8 +530,9 @@
 
 %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)
@@ -558,11 +564,11 @@
 
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -570,6 +576,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.225  2012/01/20 19:04:42  baggins
+- unify systemd service names with SysV to ease transition
+
 Revision 1.224  2012/01/19 20:08:18  baggins
 - rel 3.2 for now, needs some work on systemd unit names
 

================================================================
Index: packages/nfs-utils/nfsd.service
diff -u packages/nfs-utils/nfsd.service:1.3 packages/nfs-utils/nfsd.service:1.4
--- packages/nfs-utils/nfsd.service:1.3	Thu Jan 19 12:32:06 2012
+++ packages/nfs-utils/nfsd.service	Fri Jan 20 20:04:42 2012
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-gssd.service?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-lock.service?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-mountd.service?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-svcgssd.service?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.224&r2=1.225&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfsd.service?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list