b=12186

i=adilger

Fix man pages for lfs

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 7f8bd17..22a0031 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -13,6 +13,11 @@
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
 
 Severity   : normal
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
 
 Severity   : normal

+Bugzilla   : 12186
+Description: Fix errors in lfs documentation
+Details    : Fixes man pages
+
+Severity   : normal

 Bugzilla   : 12606
 Description: don't use GFP_* in generic Lustre code.
 Details    : Use cfs_alloc_* functions and CFS_* flags for code portability.
 Bugzilla   : 12606
 Description: don't use GFP_* in generic Lustre code.
 Details    : Use cfs_alloc_* functions and CFS_* flags for code portability.

diff --git a/lustre/doc/lfs.1 b/lustre/doc/lfs.1
index bd673da..d8f4c76 100644 (file)
--- a/lustre/doc/lfs.1
+++ b/lustre/doc/lfs.1
@@ -58,20 +58,20 @@ To list the striping info for given filename or files in a directory or recursiv
 .B quotachown
 To change files' owner and group on OSTs of the specified filesystem
 .TP
 .B quotachown
 To change files' owner and group on OSTs of the specified filesystem
 .TP

-.B quotacheck
-To scan the specified filesystem for disk usage, and create or update quota files
+.B quotacheck [-ugf] <filesystem>
+To scan the specified filesystem for disk usage, and create or update quota files. Options specify quota for users (-u) groups (-g) and force (-f)

 .TP
 .TP

-.B quotaon
-To turn filesystem quotas on
+.B quotaon [-ugf] <filesystem>
+To turn filesystem quotas on. Options specify quota for users (-u) groups (-g) and force (-f)

 .TP
 .TP

-.B quotaoff
-To turn filesystem quotas off
+.B quotaoff [-ugf] <filesystem>
+To turn filesystem quotas off.  Options specify quota for users (-u) groups (-g) and force (-f)

 .TP
 .TP

-.B setquota
-To set filesystem quotas
+.B setquota  [-u|-g] <name> <block-softlimit> <block-hardlimit> <inode-softlimit> <inode-hardlimit> <filesystem>
+To set filesystem quotas for users or groups. Limits are specific as blocks and inodes, see EXAMPLES

 .TP
 .TP

-.B quota
-To display disk usage and limits
+.B quota [-o obd_uuid] [-u|-g] <name> <filesystem>
+To display disk usage and limits, either for the full filesystem, or for objects on a specific obd. A user or group name must be specified.

 .TP
 .B check 
 Display the status of MDS or OSTs (as specified in the command) or all the servers (MDS and OSTs)
 .TP
 .B check 
 Display the status of MDS or OSTs (as specified in the command) or all the servers (MDS and OSTs)


@@ -111,7 +111,7 @@ Recursively list all files in a given directory that have objects on OST2-UUID.
 Change file owner and group
 .TP
 .B $ lfs quotacheck -ug /mnt/lustre
 Change file owner and group
 .TP
 .B $ lfs quotacheck -ug /mnt/lustre

-Quotacheck for user and group
+Quotacheck for user and group - will turn on quotas after making the check.

 .TP
 .B $ lfs quotaon -ug /mnt/lustre
 Turn quotas of user and group on
 .TP
 .B $ lfs quotaon -ug /mnt/lustre
 Turn quotas of user and group on

diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre
index 0e3acba..73c5b22 100755 (executable)
--- a/lustre/scripts/lustre
+++ b/lustre/scripts/lustre
@@ -28,8 +28,8 @@ SERVICE=${0##*/}
 [ -f /etc/sysconfig/lustre ] && . /etc/sysconfig/lustre
 
 : ${LUSTRE_CONFIG_XML:=/etc/lustre/config.xml}
 [ -f /etc/sysconfig/lustre ] && . /etc/sysconfig/lustre
 
 : ${LUSTRE_CONFIG_XML:=/etc/lustre/config.xml}

-: ${LCONF:=/usr/sbin/lconf}
-: ${LCTL:=/usr/sbin/lctl}
+: ${LCONF:=lconf}
+: ${LCTL:=lctl}

 # Some distros use modprobe.conf.local
 if [ -f /etc/modprobe.conf.local ]; then
    : ${MODPROBE_CONF:=/etc/modprobe.conf.local}
 # Some distros use modprobe.conf.local
 if [ -f /etc/modprobe.conf.local ]; then
    : ${MODPROBE_CONF:=/etc/modprobe.conf.local}


@@ -214,7 +214,7 @@ status() {
        # If Lustre is up , check if the service really exists
         # Skip this is we are not checking a specific service
        if [ $RETVAL -eq 0 ] && [ $SERVICE != 'lustre' ]; then
        # If Lustre is up , check if the service really exists
         # Skip this is we are not checking a specific service
        if [ $RETVAL -eq 0 ] && [ $SERVICE != 'lustre' ]; then

-               DUMMY=`lctl dl | grep $SERVICE`
+               DUMMY=$( $LCTL dl | grep "$SERVICE")

                [ $? -ne 0 ] && STATE="not_found" && RETVAL=3
        fi
 
                [ $? -ne 0 ] && STATE="not_found" && RETVAL=3
        fi