Enable nfslock in services file instead of in basic post-install

Note sure why it was done this way...

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/templates/RHEL5.services b/templates/RHEL5.services
index a02f91e9d82c5b5d0b569e8b9030bf9158ce6129..4eadb0f0b5fc91adea745c946324a1d5bea7831b 100644 (file)
--- a/templates/RHEL5.services
+++ b/templates/RHEL5.services
@@ -15,7 +15,6 @@ chkconfig ipmi off
 chkconfig iptables off
 chkconfig irda off
 chkconfig kudzu off
-chkconfig nfslock off
 chkconfig nscd off
 chkconfig pand off
 chkconfig pcscd off
@@ -30,3 +29,4 @@ chkconfig gpm off
 
 echo "Turn on some services..."
 chkconfig multipathd on
+chkconfig nfslock on

diff --git a/templates/RHEL6.services b/templates/RHEL6.services
index a02f91e9d82c5b5d0b569e8b9030bf9158ce6129..5a23667f7193f5d9c6d3b9921ecfdc895b26fd23 100644 (file)
--- a/templates/RHEL6.services
+++ b/templates/RHEL6.services
@@ -15,7 +15,6 @@ chkconfig ipmi off
 chkconfig iptables off
 chkconfig irda off
 chkconfig kudzu off
-chkconfig nfslock off
 chkconfig nscd off
 chkconfig pand off
 chkconfig pcscd off

diff --git a/templates/RHEL7.services b/templates/RHEL7.services
index 8874a02d79c27647dba8b70463973b933016d18b..4e7614ff99108c6ea0a0292fac5001cc841ad8b0 100644 (file)
--- a/templates/RHEL7.services
+++ b/templates/RHEL7.services
@@ -5,7 +5,6 @@ while read s ; do
 done <<EOF
 atd
 avahi-daemon
-nfslock
 EOF
 
 chkconfig rhnsd off

diff --git a/templates/basic-postinstall.sh b/templates/basic-postinstall.sh
index faa422f0c7b08a461b4083c8de8a09a1b5c51a7b..70e0c2357aa2fe28ba80542af2aaa5e0e88b7b83 100644 (file)
--- a/templates/basic-postinstall.sh
+++ b/templates/basic-postinstall.sh
@@ -54,9 +54,4 @@ yum clean all
 # the base install.
 rm -f /etc/udev/rules.d/70-persistent-net.rules
 
-# Useful for both NAS cluster nodes and client nodes.  Only really
-# needed on RHEL5 since this gets started by default on RHEL6.
-echo "Enabling NFS locking"
-chkconfig nfslock on
-
 sync