Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/edquota Split "file system" like usual. Improve SYN...
details: https://anonhg.NetBSD.org/src/rev/3ea465ab2b69
branches: trunk
changeset: 762960:3ea465ab2b69
user: wiz <wiz%NetBSD.org@localhost>
date: Sun Mar 06 17:32:38 2011 +0000
description:
Split "file system" like usual. Improve SYNOPSIS. Various other fixes.
diffstat:
usr.sbin/edquota/edquota.8 | 80 ++++++++++++++++++++-------------------------
1 files changed, 36 insertions(+), 44 deletions(-)
diffs (196 lines):
diff -r afd233a08892 -r 3ea465ab2b69 usr.sbin/edquota/edquota.8
--- a/usr.sbin/edquota/edquota.8 Sun Mar 06 17:25:32 2011 +0000
+++ b/usr.sbin/edquota/edquota.8 Sun Mar 06 17:32:38 2011 +0000
@@ -29,7 +29,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)edquota.8 8.2 (Berkeley) 4/27/95
-.\" $NetBSD: edquota.8,v 1.13 2011/03/06 17:08:42 bouyer Exp $
+.\" $NetBSD: edquota.8,v 1.14 2011/03/06 17:32:38 wiz Exp $
.\"
.Dd February 6, 2011
.Dt EDQUOTA 8
@@ -39,54 +39,45 @@
.Nd edit user quotas
.Sh SYNOPSIS
.Nm
-.Op Fl D
-.Op Fl H
-.Op Fl u
-.Op Fl f Ar filesystem
+.Op Fl DHu
+.Op Fl f Ar file-system
.Op Fl p Ar proto-username
.Ar -d |
.Ar username ...
.Nm
-.Op Fl D
-.Op Fl H
+.Op Fl DH
.Fl g
-.Op Fl f Ar filesystem
+.Op Fl f Ar file-system
.Op Fl p Ar proto-groupname
.Ar -d |
.Ar groupname ...
.Nm
-.Op Fl D
-.Op Fl H
-.Op Fl u
-.Op Fl f Ar filesystem
+.Op Fl DHu
+.Op Fl f Ar file-system
.Op Fl h Ar block#/inode#
.Op Fl s Ar block#/inode#
.Op Fl t Ar block grace time/inode grace time
.Ar -d |
.Ar username ...
.Nm
-.Op Fl D
-.Op Fl H
+.Op Fl DH
.Fl g
-.Op Fl f Ar filesystem
+.Op Fl f Ar file-system
.Op Fl h Ar block#/inode#
.Op Fl s Ar block#/inode#
.Op Fl t Ar block grace time/inode grace time
.Ar -d |
.Ar groupname ...
.Nm
-.Op Fl D
-.Op Fl H
-.Op Fl u
+.Op Fl DHu
.Fl c
-.Op Fl f Ar filesystem
+.Op Fl f Ar file-system
.Ar username ...
.Nm
-.Op Fl D
-.Op Fl H
+.Op Fl DH
.Fl g
.Fl c
-.Op Fl f Ar filesystem
+.Op Fl f Ar file-system
.Ar groupname ...
.Sh DESCRIPTION
.Nm
@@ -96,15 +87,15 @@
flag is specified,
one or more users may be specified on the command line.
Unless
-.Fl h,
-.Fl s
+.Fl h ,
+.Fl s ,
or
.Fl t
are used, a temporary file is created for each user with an ASCII
representation of the current disk quotas and grace time for that user.
-By default, quota for all quota-enabled filesystems are edited; the
+By default, quota for all quota-enabled file systems are edited; the
.Fl f
-option can be used to restrict it to a single filesystem.
+option can be used to restrict it to a single file system.
An editor is invoked on the ASCII file.
The editor invoked is
.Xr vi 1
@@ -113,7 +104,7 @@
specifies otherwise.
.Pp
The quotas may then be modified, new quotas added, etc.
-Setting a quota to - or unlimited indicates that no quota should be imposed.
+Setting a quota to \- or unlimited indicates that no quota should be imposed.
Setting a quota to zero indicates that no allocation is permited.
Setting a soft limit to zero with a unlimited hard limit
indicates that allocations should be permitted on only a temporary basis.
@@ -121,7 +112,7 @@
only the hard and soft limits, and grace time can be changed.
.Pp
Users are permitted to exceed their soft limits
-for a grace period that may be specified per user (or per-filesystem
+for a grace period that may be specified per user (or per-file system
for quota version 1).
Once the grace period has expired,
the soft limit is enforced as a hard limit.
@@ -132,7 +123,10 @@
.Xr humanize_number 9
suffix (K for kilo, M for mega, G for giga, T for tera).
Time can be entered with Y (year), W (week), D (day), H (hour) and M (minute)
-suffixes. Suffixes can be mixed (see EXAMPLES below).
+suffixes.
+Suffixes can be mixed (see
+.Sx EXAMPLES
+below).
If the
.Fl H
option if used, current quota, disk usage and time are displayed in
@@ -152,14 +146,14 @@
.Pp
The
.Fl h ,
-.Fl s
+.Fl s ,
and
.Fl t
flags can be used to change quota limits (hard, soft and grace time,
respectively) without user interaction, for usage in e.g. batch scripts.
The arguments are the new block and inode number limit or grace time,
-separated by a slash. Units suffix may be used, as in the editor
-above.
+separated by a slash.
+Units suffix may be used, as in the editor above.
.Pp
If the
.Fl g
@@ -168,7 +162,7 @@
is invoked to edit the quotas of
one or more groups specified on the command line.
.Pp
-With quota version 2, there is a per-filesystem user or group
+With quota version 2, there is a per-file system user or group
default quota to be copied to a user or group quota on the first
allocation.
The
@@ -176,13 +170,14 @@
flag adds the default quota to the list of users or groups to edit.
.Pp
For quota version 1, there is no default block/inode quota, and no
-per-user/group grace time. To edit the filesystem-wide grace time, use
+per-user/group grace time.
+To edit the file system-wide grace time, use
.Fl d .
.Pp
-On quota2-enabled filesystems, the
+On quota2-enabled file systems, the
.Fl c
flag cause edquota to clear quota entries for the specified users or groups.
-If disk or inode usages is not 0, limits are reverted to the default quota.
+If disk or inode usages is not 0, limits are reverted to the default quota.
If disk and inode usages are 0, the existing quota entries are freed.
.Pp
The
@@ -192,16 +187,13 @@
.Pp
Only the super-user may edit quotas.
.Sh EXAMPLES
-Edit quotas for group games on all quota-enabled filesystems:
-.Bd -literal
- edquota -g
-.Ed
+Edit quotas for group games on all quota-enabled file systems:
+.Dl edquota -g
Set 4MB hard block limit, 2MB soft block limit, 2048 inode hard limit,
1024 inode soft limit, 2 weeks and 3 days (or 17 days) block and inode grace
-time for the default quotas on filesystem /home:
-.Bd -literal
- edquota -h 4M/2k -s 2M/1k -t 2W3D/2W3D -f /home -u -d
-.Ed
+time for the default quotas on file system
+.Pa /home :
+.Dl edquota -h 4M/2k -s 2M/1k -t 2W3D/2W3D -f /home -u -d
.Sh SEE ALSO
.Xr quota 1 ,
.Xr quotactl 2 ,
Home |
Main Index |
Thread Index |
Old Index