[nfs-utils/f17] Enable legacy service names (bz 832100)

[Steve Dickson]

commit d2ee340a1a29ce02954dba2299bb84f266409dc6
Author: Steve Dickson <steved at redhat.com>
Date:   Thu Jun 14 09:53:08 2012 -0400

    Enable legacy service names (bz 832100)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-idmap.service         |    1 +
 nfs-lock.service          |    1 +
 nfs-secure-server.service |    1 +
 nfs-secure.service        |    1 +
 nfs-server.service        |    1 +
 nfs-utils.spec            |    6 +++++-
 6 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/nfs-idmap.service b/nfs-idmap.service
index 872ae09..d8be179 100644
--- a/nfs-idmap.service
+++ b/nfs-idmap.service
@@ -2,6 +2,7 @@
 Description=NFSv4 ID-name mapping daemon
 BindTo=nfs-server.service
 After=nfs-server.service
+Names=rpcidmapd.service
 
 [Service]
 Type=forking
diff --git a/nfs-lock.service b/nfs-lock.service
index f9b6fac..623369e 100644
--- a/nfs-lock.service
+++ b/nfs-lock.service
@@ -3,6 +3,7 @@ Description=NFS file locking service.
 Requires=rpcbind.service network.target
 After=network.target named.service rpcbind.service
 Before=remote-fs-pre.target
+Names=nfslock.service
 
 [Service]
 Type=forking
diff --git a/nfs-secure-server.service b/nfs-secure-server.service
index cd64cb3..b58a6c5 100644
--- a/nfs-secure-server.service
+++ b/nfs-secure-server.service
@@ -2,6 +2,7 @@
 Description=Secure NFS Server
 Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service
 After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service 
+Names=rpcsvcgssd.service
 
 [Service]
 Type=forking
diff --git a/nfs-secure.service b/nfs-secure.service
index c5a652e..d9192f1 100644
--- a/nfs-secure.service
+++ b/nfs-secure.service
@@ -2,6 +2,7 @@
 Description=Secure NFS
 Requires=var-lib-nfs-rpc_pipefs.mount
 After=syslog.target var-lib-nfs-rpc_pipefs.mount
+Names=rpcgssd.service
 
 [Service]
 Type=forking
diff --git a/nfs-server.service b/nfs-server.service
index 95ade87..e4078fc 100644
--- a/nfs-server.service
+++ b/nfs-server.service
@@ -3,6 +3,7 @@ Description=NFS Server
 Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service
 Requires=nfs-idmap.service nfs-mountd.service nfs-rquotad.service
 After=network.target named.service
+Names=nfs.service
 
 [Service]
 Type=oneshot
diff --git a/nfs-utils.spec b/nfs-utils.spec
index b439aa0..9692585 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -142,6 +142,7 @@ install -m 644 %{SOURCE60} $RPM_BUILD_ROOT/lib/modprobe.d/nfs.conf
 for service in %{nfs_services} ; do
 	install -m 644 $service $RPM_BUILD_ROOT/lib/systemd/system
 done
+
 for service in %{nfs_automounts} ; do
 	install -m 644 $service $RPM_BUILD_ROOT/lib/systemd/system
 done
@@ -293,6 +294,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Jun 12 2012 Steve Dickson <steved at redhat.com> 1.2.6-2
+- Enable legacy service names (bz 832100).
+
 * Tue May 29 2012 Steve Dickson <steved at redhat.com> 1.2.6-1
 - Updated to latest upstream RC release: nfs-utils.1.2.7-rc1 (bz 595420)
 - Fixed typo in the checking of nfsnobody