commit d7ae000d0d8c39f027a22af0e08dc62fc2fd440b Author: Juergen Daubert <jue@jue.li> Date: Tue Jun 30 11:51:53 2015 +0200 nfs-utils: add status option to the nfs* rc scripts diff --git a/nfs-utils/.md5sum b/nfs-utils/.md5sum index d0473ea..4cd0d41 100644 --- a/nfs-utils/.md5sum +++ b/nfs-utils/.md5sum @@ -1,11 +1,11 @@ c5ccf58f5f9f57aba75c8b72219eb6e6 exports 167ea3a16eb6f33b3642e920147bb265 idmapd.conf -6d383530212eb1f70811e73282358036 nfs +49054b601b8277e86cafae36911cba46 nfs 1e2f3c1ed468dee02d00c534c002ea10 nfs-utils-1.3.2.tar.bz2 -cdb5314516ef986b5283ee7dcc7d2278 nfsclient -794de0e76b5532fa68ac3ad57bd78856 nfsserver +6981419f23fbe0a0ef3b44eb2efac8fd nfsclient +eb907aa29567365aef517b7948dc9aa0 nfsserver dfe1c59368b5846316ebcf3b32666c54 rpc.idmapd ae09bd1df5f97d36b551c067d0f9261a rpc.mountd -abde0543c54fac9353cb22015fa7a898 rpc.nfsd +d5f41aee9b491bf23d7986e4445dbc92 rpc.nfsd 21d75587a1538b325bc9be0ecd9426a5 rpc.statd b4c745cd305c718157af2f24eef21525 statd_foreground_mode.patch diff --git a/nfs-utils/Pkgfile b/nfs-utils/Pkgfile index 26df0cb..70f21fe 100644 --- a/nfs-utils/Pkgfile +++ b/nfs-utils/Pkgfile @@ -5,7 +5,7 @@ name=nfs-utils version=1.3.2 -release=4 +release=5 source=(http://downloads.sourceforge.net/project/nfs/$name/$version/$name-$version.t... exports idmapd.conf nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd diff --git a/nfs-utils/nfs b/nfs-utils/nfs index a3eccfd..ccc414a 100644 --- a/nfs-utils/nfs +++ b/nfs-utils/nfs @@ -21,8 +21,12 @@ restart) $0 stop $0 start ;; +status) + /etc/rc.d/rpc.idmapd status + /etc/rc.d/rpc.statd status + ;; *) - echo "usage: $0 [start|stop|restart]" + echo "usage: $0 [start|stop|restart|status]" ;; esac diff --git a/nfs-utils/nfsclient b/nfs-utils/nfsclient index 1dc429b..2a7401c 100644 --- a/nfs-utils/nfsclient +++ b/nfs-utils/nfsclient @@ -14,8 +14,11 @@ restart) $0 stop $0 start ;; +status) + /bin/findmnt -t nfs,nfs4 + ;; *) - echo "usage: $0 [start|stop|restart]" + echo "usage: $0 [start|stop|restart|status]" ;; esac diff --git a/nfs-utils/nfsserver b/nfs-utils/nfsserver index ed02853..09ec88b 100644 --- a/nfs-utils/nfsserver +++ b/nfs-utils/nfsserver @@ -23,8 +23,12 @@ restart) $0 stop $0 start ;; +status) + /etc/rc.d/rpc.mountd status + /etc/rc.d/rpc.nfsd status + ;; *) - echo "usage: $0 [start|stop|restart]" + echo "usage: $0 [start|stop|restart|status]" ;; esac diff --git a/nfs-utils/rpc.nfsd b/nfs-utils/rpc.nfsd index 9655a35..22a1659 100644 --- a/nfs-utils/rpc.nfsd +++ b/nfs-utils/rpc.nfsd @@ -22,8 +22,7 @@ restart) status) $SSD --status --name $NAME case $? in - 0) echo "$PROG is running" ;; - 1) echo "$PROG is not running but the pid file $PID exists" ;; + 0) echo "$PROG is running with pid $(pgrep -o -x nfsd[4]?)" ;; 3) echo "$PROG is not running" ;; 4) echo "Unable to determine the program status" ;; esac