- use generic portmapper check from rc-scripts

Changed files:
    nfs.init -> 1.47
    nfsfs.init -> 1.38
    nfslock.init -> 1.20
    rpcgssd.init -> 1.8
    rpcidmapd.init -> 1.13
    rpcsvcgssd.init -> 1.11
    rquotad.init -> 1.19

diff --git a/nfs.init b/nfs.init
index 3c115bfa6a717aa02cc39742afdac7b3e05f675c..0da6062e1f467d2d9646c2c351f8981f3c2033ae 100644 (file)
--- a/nfs.init
+++ b/nfs.init
@@ -34,8 +34,8 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-       [ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
 start() {

diff --git a/nfsfs.init b/nfsfs.init
index 6168d1914bcdd59d03063577c5ae9c741d9ecf51..d25609165c518bcd27d5fbe5cf9890f593f6441b 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -31,8 +31,8 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-       [ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
 start() {

diff --git a/nfslock.init b/nfslock.init
index 609cb8939e5a39f188dcccd67ee69c65851b956f..063633466f15262f76d2825fe9a5acd086f1957e 100644 (file)
--- a/nfslock.init
+++ b/nfslock.init
@@ -30,8 +30,8 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-       [ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
 # /usr may be on NFS, fail silently, nfsfs will start it

diff --git a/rpcgssd.init b/rpcgssd.init
index 4d67756e22a0b61bd8a6e951d7422532663242e6..803882c75048994b1c2eba6e7fd2c3323e429709 100644 (file)
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -22,8 +22,8 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-       [ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
 # Get service config

diff --git a/rpcidmapd.init b/rpcidmapd.init
index 298698062c4058cef74cf05471740aa318d19ba7..eda321ae543d36ef9b0aa8a29516548e574c2a20 100644 (file)
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -22,8 +22,8 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-       [ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
 # Get service config

diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index 2f63c9aec847b7bd04411d593fe779e839e9abed..4c634bf8f7005b459af6be919dcbfac66a4c90cc 100644 (file)
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -22,8 +22,8 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-       [ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
 # Get service config

diff --git a/rquotad.init b/rquotad.init
index ccefafffd2419c39926aa1dc4e1993d81b7a8da8..1bfadb17b763d71eeae938fa7be116e92a8f093e 100644 (file)
--- a/rquotad.init
+++ b/rquotad.init
@@ -29,9 +29,8 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ] && [ -z "`/sbin/pidof portmap`" ]; then
-       echo "Error: portmap isn't running"
-       exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
 start() {