ctdb-scripts: Rename variable nfslock_service to nfs_lock_service
authorMartin Schwenke <martin@meltin.net>
Wed, 20 Mar 2019 03:50:59 +0000 (14:50 +1100)
committerMartin Schwenke <martins@samba.org>
Sun, 31 Mar 2019 10:45:20 +0000 (10:45 +0000)
There will be more of these variable for other services so, for
readability, it makes sense for them to start with "nfs_".

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13860

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@samba.org>
ctdb/config/nfs-linux-kernel-callout

index 295989cd0ffb524b61cfda3a8fcc834be0f9ba4d..73623d87875ad69fecd32e0010354a168ec8eab1 100755 (executable)
@@ -14,17 +14,17 @@ nfs_exports_file="${CTDB_NFS_EXPORTS_FILE:-/var/lib/nfs/etab}"
 
 # Red Hat
 nfs_service="nfs"
-nfslock_service="nfslock"
+nfs_lock_service="nfslock"
 nfs_config="/etc/sysconfig/nfs"
 
 # SUSE
 #nfs_service="nfsserver"
-#nfslock_service=""
+#nfs_lock_service=""
 #nfs_config="/etc/sysconfig/nfs"
 
 # Debian
 #nfs_service="nfs-kernel-server"
-#nfslock_service=""
+#nfs_lock_service=""
 #nfs_config="/etc/default/nfs-kernel-server"
 
 # Override for unit testing
@@ -55,13 +55,13 @@ basic_stop ()
        case "$1" in
        nfs)
                service "$nfs_service" stop
-               if [ -n "$nfslock_service" ] ; then
-                       service "$nfslock_service" stop
+               if [ -n "$nfs_lock_service" ] ; then
+                       service "$nfs_lock_service" stop
                fi
                ;;
        nfslock)
-               if [ -n "$nfslock_service" ] ; then
-                       service "$nfslock_service" stop
+               if [ -n "$nfs_lock_service" ] ; then
+                       service "$nfs_lock_service" stop
                else
                        service "$nfs_service" stop
                fi
@@ -75,14 +75,14 @@ basic_start ()
 {
        case "$1" in
        nfs)
-               if [ -n "$nfslock_service" ] ; then
-                       service "$nfslock_service" start
+               if [ -n "$nfs_lock_service" ] ; then
+                       service "$nfs_lock_service" start
                fi
                service "$nfs_service" start
                ;;
        nfslock)
-               if [ -n "$nfslock_service" ] ; then
-                       service "$nfslock_service" start
+               if [ -n "$nfs_lock_service" ] ; then
+                       service "$nfs_lock_service" start
                else
                        service "$nfs_service" start
                fi