diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2015-06-30 00:20:39 +0200 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2015-06-30 00:20:39 +0200 |
| commit | f346ca53a4580fc896a3d1443cb219d2e60a9960 (patch) | |
| tree | a606ff2938962afe8dfc93aebe00cafe504c3080 /nfs-utils | |
| parent | f88f71a822af53e6b6135482bb24eb66f2aed41f (diff) | |
| parent | 3355cce9a8d1db8fd0bacdf586de401c9da1f66e (diff) | |
| download | opt-f346ca53a4580fc896a3d1443cb219d2e60a9960.tar.gz opt-f346ca53a4580fc896a3d1443cb219d2e60a9960.tar.xz | |
Merge branch '3.1' into 3.2
Diffstat (limited to 'nfs-utils')
| -rw-r--r-- | nfs-utils/.md5sum | 6 | ||||
| -rw-r--r-- | nfs-utils/rpc.idmapd | 2 | ||||
| -rw-r--r-- | nfs-utils/rpc.mountd | 2 | ||||
| -rw-r--r-- | nfs-utils/rpc.statd | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nfs-utils/.md5sum b/nfs-utils/.md5sum index 297f6eb41..d0473eacc 100644 --- a/nfs-utils/.md5sum +++ b/nfs-utils/.md5sum @@ -4,8 +4,8 @@ c5ccf58f5f9f57aba75c8b72219eb6e6 exports 1e2f3c1ed468dee02d00c534c002ea10 nfs-utils-1.3.2.tar.bz2 cdb5314516ef986b5283ee7dcc7d2278 nfsclient 794de0e76b5532fa68ac3ad57bd78856 nfsserver -c43297cce919319aeef70cfd25103850 rpc.idmapd -4d37ba8d95cc2acd5a9e1bd942b8e89b rpc.mountd +dfe1c59368b5846316ebcf3b32666c54 rpc.idmapd +ae09bd1df5f97d36b551c067d0f9261a rpc.mountd abde0543c54fac9353cb22015fa7a898 rpc.nfsd -9c70fa34927bd6d7723e0a36253e0a52 rpc.statd +21d75587a1538b325bc9be0ecd9426a5 rpc.statd b4c745cd305c718157af2f24eef21525 statd_foreground_mode.patch diff --git a/nfs-utils/rpc.idmapd b/nfs-utils/rpc.idmapd index 293aa9ea5..c3adf96a3 100644 --- a/nfs-utils/rpc.idmapd +++ b/nfs-utils/rpc.idmapd @@ -22,7 +22,7 @@ restart) status) $SSD --status --pidfile $PID case $? in - 0) echo "$PROG is running" ;; + 0) echo "$PROG is running with pid $(cat $PID)" ;; 1) echo "$PROG is not running but the pid file $PID exists" ;; 3) echo "$PROG is not running" ;; 4) echo "Unable to determine the program status" ;; diff --git a/nfs-utils/rpc.mountd b/nfs-utils/rpc.mountd index 650ddc7e0..316717c1a 100644 --- a/nfs-utils/rpc.mountd +++ b/nfs-utils/rpc.mountd @@ -22,7 +22,7 @@ restart) status) $SSD --status --pidfile $PID case $? in - 0) echo "$PROG is running" ;; + 0) echo "$PROG is running with pid $(cat $PID)" ;; 1) echo "$PROG is not running but the pid file $PID exists" ;; 3) echo "$PROG is not running" ;; 4) echo "Unable to determine the program status" ;; diff --git a/nfs-utils/rpc.statd b/nfs-utils/rpc.statd index 451d2b8b0..6acf45b90 100644 --- a/nfs-utils/rpc.statd +++ b/nfs-utils/rpc.statd @@ -22,7 +22,7 @@ restart) status) $SSD --status --pidfile $PID case $? in - 0) echo "$PROG is running" ;; + 0) echo "$PROG is running with pid $(cat $PID)" ;; 1) echo "$PROG is not running but the pid file $PID exists" ;; 3) echo "$PROG is not running" ;; 4) echo "Unable to determine the program status" ;; |