* Re: [PATCH] sfdisk: make some tests conditional to !Linux
From: Karel Zak @ 2011-08-22 8:32 UTC (permalink / raw)
To: giulioo; +Cc: util-linux
In-Reply-To: <20110818073019.B70AFF815@i3.golden.dom>
On Thu, Aug 18, 2011 at 09:30:30AM +0200, Giulio wrote:
> + if (!chs_ok(b, PNO(p), _("start")) && !Linux)
[...]
> + if (!chs_ok(b, PNO(p), _("end")) && !Linux)
would be better to use
if (!Linux && chs_ok(b, PNO(p), ....)
so the chs_ok() will not called on Linux at all?
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply
* Re: man-pages and usage() howto
From: Karel Zak @ 2011-08-22 8:16 UTC (permalink / raw)
To: kerolasa; +Cc: Benno Schulenberg, util-linux
In-Reply-To: <CAG27Bk0m45JFtP2MNz27tgJ=-f5XZDHUtd1C9O4X0ALO52-BVA@mail.gmail.com>
On Sat, Aug 20, 2011 at 09:08:08PM +0200, Sami Kerola wrote:
> On Sat, Aug 20, 2011 at 11:10, Benno Schulenberg <bensberg@justemail.net> wrote:
> > On Wed, 17 Aug 2011 15:07 +0200, "Sami Kerola" <kerolasa@iki.fi> wrote:
> >> On Tue, Aug 16, 2011 at 12:39, Karel Zak <kzak@redhat.com> wrote:
> >>> It would be also nice to sync man pages with usage() format.
> >
> > Do you mean that you want to use "--option <argument>" also in the
> > man pages, Karel? Or do we stick there to italics for arguments?
> > (Which translates to underlining on terminals.)
I mean that we need to use the lowercase for the arguments in usage()
as well as in man pages.
> IMHO the following looks quite ok, and not too different to
> usage().
>
> .TP
> \fB\-n\fR, \fB\-\-no\-argument\fR
> This option does not use argument.
> .TP
> \fB\-o\fR, \fB\-\-optional\fR[=<\fIarg\fR>]
> This option uses optional argument.
> .TP
> \fB\-r\fR, \fB\-\-required\fR <\fIarg\fR>
> This option requires an argument.
>
> Comments?
I have no strong opinion about it. Benno is probably right that
italics for the arguments is enough.
We already use option arguments without diamond brackets in our man
pages, so let's continue with this convention to minimize number of
changes in the man pages ;-)
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply
* Re: man-pages and usage() howto
From: Sami Kerola @ 2011-08-21 10:56 UTC (permalink / raw)
To: Benno Schulenberg; +Cc: Karel Zak, util-linux
In-Reply-To: <CAG27Bk0m45JFtP2MNz27tgJ=-f5XZDHUtd1C9O4X0ALO52-BVA@mail.gmail.com>
On Sat, Aug 20, 2011 at 21:08, Sami Kerola <kerolasa@iki.fi> wrote:
> What ever was meant the howto is incomplete.
>
> https://github.com/kerolasa/lelux-utiliteetit/blob/docs-dir/Documentation=
/howto-man-page.txt
I took another look of the howto-man-page, and changed bits here and
there. Is that now better or worse? Should there be more examples
about some common thing I missed?
--=20
=A0=A0 Sami Kerola
=A0=A0 http://www.iki.fi/kerolasa/
^ permalink raw reply
* Re: man-pages and usage() howto
From: Sami Kerola @ 2011-08-20 19:08 UTC (permalink / raw)
To: Benno Schulenberg; +Cc: Karel Zak, util-linux
In-Reply-To: <1313831405.14363.140258131741205@webmail.messagingengine.com>
On Sat, Aug 20, 2011 at 11:10, Benno Schulenberg <bensberg@justemail.net> wrote:
> On Wed, 17 Aug 2011 15:07 +0200, "Sami Kerola" <kerolasa@iki.fi> wrote:
>> On Tue, Aug 16, 2011 at 12:39, Karel Zak <kzak@redhat.com> wrote:
>>>
>> -n, --no-argument this option requires no_argument
>> -o, --optional[=arg] this option has optional_argument
>> -r, --required <arg> this option requires required_argument
>
> The middle one would need the pointy brackets, too, no?
>
> -o, --optional[=<arg>] this option has optional_argument
You are right. Fixed to howto-usage-function.txt
>> How putting to c.h the following?
>>
>> #define USAGE_HEADER _("\nUsage:\n")
>> #define USAGE_OPTIONS _("\nOptions:\n")
>> #define USAGE_SHORT_TAIL _("\n")
>> #define USAGE_MAN_TAIL _("For more details see %s.")
>
> Especially the latter would be nice: at the moment there are
> many such lines with just a differing final word.
>
>> Having also definition for OPTION_HELP && OPTION_VERSION would be
>> good.
>
> That won't work -- the amount of indentation for the option description
> is not the same for all utilities. And to make it the same for all would
> create ugly and unneeded wide open text spaces for some tools.
To me it does not sound a big deal if --help and --version
description begins from different indent than rest of lines. I
wrote example output that way, so that you can judge how that
will look.
https://github.com/kerolasa/lelux-utiliteetit/blob/docs-dir/Documentation/howto-usage-function.txt
I do not understand why it would be sensible to ask translation
teams to make tens of versions near same help & usage strings
while these string could simply be a bit ugly.
>>> I made the decision, --option <argument>. [...]
>>>
>>> It would be also nice to sync man pages with usage() format.
>
> Do you mean that you want to use "--option <argument>" also in the
> man pages, Karel? Or do we stick there to italics for arguments?
> (Which translates to underlining on terminals.)
What ever was meant the howto is incomplete.
https://github.com/kerolasa/lelux-utiliteetit/blob/docs-dir/Documentation/howto-man-page.txt
IMHO the following looks quite ok, and not too different to
usage().
.TP
\fB\-n\fR, \fB\-\-no\-argument\fR
This option does not use argument.
.TP
\fB\-o\fR, \fB\-\-optional\fR[=<\fIarg\fR>]
This option uses optional argument.
.TP
\fB\-r\fR, \fB\-\-required\fR <\fIarg\fR>
This option requires an argument.
Comments?
--
Sami Kerola
http://www.iki.fi/kerolasa/
^ permalink raw reply
* [patches] uniformizing the man page headers and footers
From: Benno Schulenberg @ 2011-08-20 9:50 UTC (permalink / raw)
To: Util-Linux
[-- Attachment #1: Type: text/plain, Size: 892 bytes --]
Hi,
The first of the patches uniformizes the .TH header lines in the
man pages, as proposed by Sami Kerola -- with the exception
that I use just "System Administration" instead of "System
Administration Utilities". The few man pages that are in troff
format, however, do not allow setting the top center header --
they insist on saying "BSD System Manager's Manual" (for 8)
or "BSD General Commands Manual" (for section 1).
The fifth patch redoes and improves the unapplied scriptreplay
man page patch from one of my previous mails.
The sixth patch removes the pluralization item from the TODO file.
Further messages will be pluralized when translators request it.
There are still some typos and small mistakes in some of the usage
help texts, but I'll supply fixes for those after the release of 2.20.
Regards,
Benno
--
http://www.fastmail.fm - The way an email service should be
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-manpages-uniformize-the-header-and-footer-lines.patch --]
[-- Type: text/x-patch; name="0001-manpages-uniformize-the-header-and-footer-lines.patch", Size: 46635 bytes --]
From 069eb8dcd866a969af388255827f2a23c6db78d6 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Thu, 18 Aug 2011 22:18:34 +0200
Subject: [PATCH 1/6] manpages: uniformize the header and footer lines
Use dates without the day, use the full month name, put "util-linux" in
the lower left corner, and "User Commands" or "System Administration"
at the top center.
Also improve here and there the one-line program description.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
disk-utils/blockdev.8 | 2 +-
disk-utils/elvtune.8 | 2 +-
disk-utils/fdformat.8 | 4 ++--
disk-utils/fsck.minix.8 | 4 ++--
disk-utils/isosize.8 | 4 ++--
disk-utils/mkfs.8 | 2 +-
disk-utils/mkfs.bfs.8 | 2 +-
disk-utils/mkfs.minix.8 | 4 ++--
disk-utils/mkswap.8 | 2 +-
disk-utils/raw.8 | 2 +-
disk-utils/swaplabel.8 | 6 +++---
fdisk/cfdisk.8 | 6 +++---
fdisk/fdisk.8 | 4 ++--
fsck/fsck.8 | 2 +-
getopt/getopt.1 | 2 +-
hwclock/hwclock.8 | 2 +-
libblkid/libblkid.3 | 2 +-
login-utils/chfn.1 | 2 +-
login-utils/chsh.1 | 2 +-
login-utils/last.1 | 2 +-
login-utils/login.1 | 2 +-
login-utils/newgrp.1 | 4 ++--
misc-utils/blkid.8 | 2 +-
misc-utils/cal.1 | 7 ++++---
misc-utils/chkdupexe.1 | 2 +-
misc-utils/ddate.1 | 4 ++--
misc-utils/findfs.8 | 2 +-
misc-utils/findmnt.8 | 2 +-
misc-utils/kill.1 | 2 +-
misc-utils/logger.1 | 4 ++--
misc-utils/look.1 | 2 +-
misc-utils/lsblk.8 | 2 +-
misc-utils/namei.1 | 4 ++--
misc-utils/rename.1 | 2 +-
misc-utils/uuidd.8 | 2 +-
misc-utils/uuidgen.1 | 4 ++--
misc-utils/whereis.1 | 2 +-
misc-utils/wipefs.8 | 2 +-
mount/fstab.5 | 2 +-
mount/losetup.8 | 2 +-
mount/mount.8 | 2 +-
mount/swapon.8 | 2 +-
mount/umount.8 | 2 +-
partx/addpart.8 | 2 +-
partx/delpart.8 | 2 +-
partx/partx.8 | 2 +-
schedutils/chrt.1 | 6 +++---
schedutils/ionice.1 | 4 ++--
schedutils/taskset.1 | 4 ++--
sys-utils/arch.1 | 10 +++++-----
sys-utils/ctrlaltdel.8 | 2 +-
sys-utils/cytune.8 | 4 ++--
sys-utils/dmesg.1 | 2 +-
sys-utils/fallocate.1 | 4 ++--
sys-utils/flock.1 | 4 ++--
sys-utils/fsfreeze.8 | 10 ++++------
sys-utils/fstrim.8 | 2 +-
sys-utils/ipcmk.1 | 2 +-
sys-utils/ipcrm.1 | 2 +-
sys-utils/ipcs.1 | 2 +-
sys-utils/ldattach.8 | 2 +-
sys-utils/lscpu.1 | 4 ++--
sys-utils/mountpoint.1 | 2 +-
sys-utils/pivot_root.8 | 4 ++--
sys-utils/readprofile.1 | 4 ++--
sys-utils/renice.1 | 4 ++--
sys-utils/rtcwake.8 | 2 +-
sys-utils/setarch.8 | 2 +-
sys-utils/setsid.1 | 2 +-
sys-utils/switch_root.8 | 4 ++--
sys-utils/tunelp.8 | 2 +-
sys-utils/unshare.1 | 2 +-
term-utils/agetty.8 | 2 +-
term-utils/mesg.1 | 2 +-
term-utils/reset.1 | 2 +-
term-utils/script.1 | 4 ++--
term-utils/scriptreplay.1 | 2 +-
term-utils/setterm.1 | 2 +-
term-utils/wall.1 | 4 ++--
term-utils/write.1 | 2 +-
text-utils/col.1 | 4 ++--
text-utils/colcrt.1 | 4 ++--
text-utils/colrm.1 | 4 ++--
text-utils/column.1 | 10 ++++++----
text-utils/hexdump.1 | 4 ++--
text-utils/line.1 | 4 ++--
text-utils/more.1 | 4 ++--
text-utils/pg.1 | 4 ++--
text-utils/rev.1 | 4 ++--
text-utils/tailf.1 | 2 +-
text-utils/ul.1 | 4 ++--
91 files changed, 143 insertions(+), 142 deletions(-)
diff --git a/disk-utils/blockdev.8 b/disk-utils/blockdev.8
index 63cd91d..2b3d64c 100644
--- a/disk-utils/blockdev.8
+++ b/disk-utils/blockdev.8
@@ -3,7 +3,7 @@
.\" Copyright 2007 Karel Zak <kzak@redhat.com>
.\"
.\" May be distributed under the GNU General Public License
-.TH BLOCKDEV 8 "Aug 2010" ""
+.TH BLOCKDEV 8 "August 2010" "util-linux" "System Administration"
.SH NAME
blockdev \- call block device ioctls from the command line
.SH SYNOPSIS
diff --git a/disk-utils/elvtune.8 b/disk-utils/elvtune.8
index 10a2e38..6321ee1 100644
--- a/disk-utils/elvtune.8
+++ b/disk-utils/elvtune.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH ELVTUNE 8 "14 March 2000" "Version 1.0"
+.TH ELVTUNE 8 "March 2000" "util-linux" "System Administration"
.SH NAME
elvtune \- I/O elevator tuner
.SH SYNOPSIS
diff --git a/disk-utils/fdformat.8 b/disk-utils/fdformat.8
index 0fa9e8d..67c5d03 100644
--- a/disk-utils/fdformat.8
+++ b/disk-utils/fdformat.8
@@ -1,8 +1,8 @@
.\" Copyright 1992, 1993 Rickard E. Faith (faith@cs.unc.edu)
.\" May be distributed under the GNU General Public License
-.TH FDFORMAT "8" "July 2011" "util-linux" "System Administration Utilities"
+.TH FDFORMAT 8 "July 2011" "util-linux" "System Administration"
.SH NAME
-fdformat \- Low-level formats a floppy disk
+fdformat \- low-level format a floppy disk
.SH SYNOPSIS
.B fdformat
[\fIoptions\fR] \fIdevice\fR
diff --git a/disk-utils/fsck.minix.8 b/disk-utils/fsck.minix.8
index f4bb4d0..8f25b0b 100644
--- a/disk-utils/fsck.minix.8
+++ b/disk-utils/fsck.minix.8
@@ -1,9 +1,9 @@
.\" Copyright 1992, 1993, 1994 Rickard E. Faith (faith@cs.unc.edu)
.\" May be freely distributed.
.\" " for hilit19
-.TH FSCK 8 "2 July 1996" "Util-Linux 2.6" "Linux Programmer's Manual"
+.TH FSCK 8 "July 1996" "util-linux" "System Administration"
.SH NAME
-fsck.minix \- a file system consistency checker for Linux
+fsck.minix \- check consistency of Minix filesystem
.SH SYNOPSIS
.B fsck.minix
.RB [ \-larvsmf ]
diff --git a/disk-utils/isosize.8 b/disk-utils/isosize.8
index 1951f02..678fd80 100644
--- a/disk-utils/isosize.8
+++ b/disk-utils/isosize.8
@@ -1,6 +1,6 @@
-.TH ISOSIZE "8" "June 2011" "util-linux" "System Administration Utilities"
+.TH ISOSIZE 8 "June 2011" "util-linux" "System Administration"
.SH NAME
-isosize \- outputs the length of an iso9660 filesystem
+isosize \- output the length of an iso9660 filesystem
.SH SYNOPSIS
.B isosize
[\fIoptions\fR] \fIiso9660_image_file\fR
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index 09cc924..02d8b06 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH MKFS "8" "June 2011" "util-linux" "System Administration Utilities"
+.TH MKFS 8 "June 2011" "util-linux" "System Administration"
.SH NAME
mkfs \- build a Linux filesystem
.SH SYNOPSIS
diff --git a/disk-utils/mkfs.bfs.8 b/disk-utils/mkfs.bfs.8
index 616c358..466d640 100644
--- a/disk-utils/mkfs.bfs.8
+++ b/disk-utils/mkfs.bfs.8
@@ -1,6 +1,6 @@
.\" Copyright 1999 Andries E. Brouwer (aeb@cwi.nl)
.\" May be freely distributed.
-.TH MKFS.BFS "8" "July 2011" "util-linux" "System Administration Utilities"
+.TH MKFS.BFS 8 "July 2011" "util-linux" "System Administration"
.SH NAME
mkfs.bfs \- make an SCO bfs filesystem
.SH SYNOPSIS
diff --git a/disk-utils/mkfs.minix.8 b/disk-utils/mkfs.minix.8
index 6a8ebae..4ee0e81 100644
--- a/disk-utils/mkfs.minix.8
+++ b/disk-utils/mkfs.minix.8
@@ -1,8 +1,8 @@
.\" Copyright 1992, 1993, 1994 Rickard E. Faith (faith@cs.unc.edu)
.\" May be freely distributed.
-.TH MKFS.MINIX 8 "2 July 1996" "Util-linux 2.6" "Linux System Administrator's Manual"
+.TH MKFS.MINIX 8 "June 2011" "util-linux" "System Administration"
.SH NAME
-mkfs.minix \- make a Linux MINIX filesystem
+mkfs.minix \- make a Minix filesystem
.SH SYNOPSIS
.B mkfs.minix
.RB [ \-c | \-l
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index ff959cb..59a93dc 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -3,7 +3,7 @@
.\" May be distributed under the GNU General Public License
.\" Rewritten for 2.1.117, aeb, 981010.
.\"
-.TH MKSWAP 8 "13 March 2009" "Linux" "Linux Programmer's Manual"
+.TH MKSWAP 8 "March 2009" "util-linux" "System Administration"
.SH NAME
mkswap \- set up a Linux swap area
.SH SYNOPSIS
diff --git a/disk-utils/raw.8 b/disk-utils/raw.8
index 9b4b957..b85080a 100644
--- a/disk-utils/raw.8
+++ b/disk-utils/raw.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH RAW 8 "Aug 1999" "Version 0.1"
+.TH RAW 8 "August 1999" "util-linux" "System Administration"
.SH NAME
raw \- bind a Linux raw character device
.SH SYNOPSIS
diff --git a/disk-utils/swaplabel.8 b/disk-utils/swaplabel.8
index 3e8103f..327a65f 100644
--- a/disk-utils/swaplabel.8
+++ b/disk-utils/swaplabel.8
@@ -2,9 +2,9 @@
.\"
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH SWAPLABEL 8 "2 April 2010" "Linux" "Linux Programmer's Manual"
+.TH SWAPLABEL 8 "April 2010" "util-linux" "System Administration"
.SH NAME
-swaplabel \- Print or change the label / UUID of a swap area
+swaplabel \- print or change the label or UUID of a swap area
.SH SYNOPSIS
.B swaplabel
.RB [ \-L
@@ -14,7 +14,7 @@ swaplabel \- Print or change the label / UUID of a swap area
.I device
.SH DESCRIPTION
.B swaplabel
-will display or change the label / UUID of a swap partition located on
+will display or change the label or UUID of a swap partition located on
.IR device
(or regular file).
.PP
diff --git a/fdisk/cfdisk.8 b/fdisk/cfdisk.8
index c6ea147..2798a7b 100644
--- a/fdisk/cfdisk.8
+++ b/fdisk/cfdisk.8
@@ -11,9 +11,9 @@
.\" permission notice identical to this one.
.\"
.\" " for hilit mode
-.TH CFDISK 8 "3 June 1995" "The BOGUS Linux Release" "Linux Programmer's Manual"
+.TH CFDISK 8 "July 2009" "util-linux" "System Administration"
.SH NAME
-cfdisk \- Curses based disk partition table manipulator for Linux
+cfdisk \- display or manipulate disk partition table
.SH SYNOPSIS
.B cfdisk
.RB [ \-agvz ]
@@ -28,7 +28,7 @@ cfdisk \- Curses based disk partition table manipulator for Linux
.RI [ device ]
.SH DESCRIPTION
.B cfdisk
-is a curses based program for partitioning any hard disk drive.
+is a curses-based program for partitioning any hard disk drive.
Typical values of the
.I device
argument are:
diff --git a/fdisk/fdisk.8 b/fdisk/fdisk.8
index 66da000..2b12f34 100644
--- a/fdisk/fdisk.8
+++ b/fdisk/fdisk.8
@@ -1,9 +1,9 @@
.\" Copyright 1992, 1993 Rickard E. Faith (faith@cs.unc.edu)
.\" Copyright 1998 Andries E. Brouwer (aeb@cwi.nl)
.\" May be distributed under the GNU General Public License
-.TH FDISK 8 "11 June 1998" "Linux 2.0" "Linux Programmer's Manual"
+.TH FDISK 8 "June 2010" "util-linux" "System Administration"
.SH NAME
-fdisk \- partition table manipulator for Linux
+fdisk \- manipulate disk partition table
.SH SYNOPSIS
.B fdisk
.RB [ \-uc ]
diff --git a/fsck/fsck.8 b/fsck/fsck.8
index 07eaaea..c10bcba 100644
--- a/fsck/fsck.8
+++ b/fsck/fsck.8
@@ -2,7 +2,7 @@
.\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH FSCK 8 "February 2009" "Linux" "MAINTENANCE COMMANDS"
+.TH FSCK 8 "February 2009" "util-linux" "System Administration"
.SH NAME
fsck \- check and repair a Linux filesystem
.SH SYNOPSIS
diff --git a/getopt/getopt.1 b/getopt/getopt.1
index 2e6fbda..a8e05ba 100644
--- a/getopt/getopt.1
+++ b/getopt/getopt.1
@@ -1,4 +1,4 @@
-.TH GETOPT 1 "May 31, 1997" Linux ""
+.TH GETOPT 1 "July 2009" "util-linux" "User Commands"
.SH NAME
getopt \- parse command options (enhanced)
.SH SYNOPSIS
diff --git a/hwclock/hwclock.8 b/hwclock/hwclock.8
index 5134403..4d6ab0a 100644
--- a/hwclock/hwclock.8
+++ b/hwclock/hwclock.8
@@ -1,4 +1,4 @@
-.TH HWCLOCK 8 "August 2011"
+.TH HWCLOCK 8 "August 2011" "util-linux" "System Administration"
.SH NAME
hwclock \- query or set the hardware clock (RTC)
.SH SYNOPSIS
diff --git a/libblkid/libblkid.3 b/libblkid/libblkid.3
index 4a5eaa9..a9291e2 100644
--- a/libblkid/libblkid.3
+++ b/libblkid/libblkid.3
@@ -5,7 +5,7 @@
.\" This file may be copied under the terms of the GNU Public License.
.\"
.\" Created Wed Sep 14 12:02:12 2001, Andreas Dilger
-.TH LIBBLKID 3 "May 2009" "util-linux"
+.TH LIBBLKID 3 "May 2009" "util-linux" "Programmer's Manual"
.SH NAME
libblkid \- block device identification library
.SH SYNOPSIS
diff --git a/login-utils/chfn.1 b/login-utils/chfn.1
index b27bec4..5329408 100644
--- a/login-utils/chfn.1
+++ b/login-utils/chfn.1
@@ -10,7 +10,7 @@
.\" $Revision: 1.1 $
.\" $Date: 1995/03/12 01:29:16 $
.\"
-.TH CHFN 1 "October 13 1994" "chfn" "Linux Reference Manual"
+.TH CHFN 1 "July 2009" "util-linux" "User Commands"
.SH NAME
chfn \- change your finger information
.SH SYNOPSIS
diff --git a/login-utils/chsh.1 b/login-utils/chsh.1
index 90514b8..393ccb7 100644
--- a/login-utils/chsh.1
+++ b/login-utils/chsh.1
@@ -10,7 +10,7 @@
.\" $Revision: 1.1 $
.\" $Date: 1995/03/12 01:28:58 $
.\"
-.TH CHSH 1 "7 October 1998" "chsh" "Linux Reference Manual"
+.TH CHSH 1 "July 2009" "util-linux" "User Commands"
.SH NAME
chsh \- change your login shell
.SH SYNOPSIS
diff --git a/login-utils/last.1 b/login-utils/last.1
index 3e9faa4..beb6917 100644
--- a/login-utils/last.1
+++ b/login-utils/last.1
@@ -1,4 +1,4 @@
-.TH LAST 1 "20 March 1992"
+.TH LAST 1 "March 1992" "util-linux" "User Commands"
.SH NAME
last \(em indicate last logins by user or terminal
.SH SYNOPSIS
diff --git a/login-utils/login.1 b/login-utils/login.1
index 1db2ca8..80fb3b3 100644
--- a/login-utils/login.1
+++ b/login-utils/login.1
@@ -1,6 +1,6 @@
.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
.\" May be distributed under the GNU General Public License
-.TH LOGIN 1 "4 November 1996" "Util-linux 1.6" "Linux Programmer's Manual"
+.TH LOGIN 1 "March 2009" "util-linux" "User Commands"
.SH NAME
login \- sign on
.SH SYNOPSIS
diff --git a/login-utils/newgrp.1 b/login-utils/newgrp.1
index 6226c15..bb5eb00 100644
--- a/login-utils/newgrp.1
+++ b/login-utils/newgrp.1
@@ -1,13 +1,13 @@
.\" Original author unknown. This man page is in the public domain.
.\" Modified Sat Oct 9 17:46:48 1993 by faith@cs.unc.edu
-.TH NEWGRP 1 "9 October 1993" "Linux 1.2" "Linux Programmer's Manual"
+.TH NEWGRP 1 "October 1993" "util-linux" "User Commands"
.SH NAME
newgrp \- log in to a new group
.SH SYNOPSIS
.B newgrp
.RI [ group ]
.SH DESCRIPTION
-.B Newgrp
+.B newgrp
changes the group identification of its caller, analogously to
.BR login (1).
The same person remains logged in, and the current directory
diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8
index 299fbd4..c797afa 100644
--- a/misc-utils/blkid.8
+++ b/misc-utils/blkid.8
@@ -5,7 +5,7 @@
.\" This file may be copied under the terms of the GNU Public License.
.\"
.\" Based on uuidgen, Mon Sep 17 10:42:12 2000, Andreas Dilger
-.TH BLKID 8 "February 2011" "Linux" "MAINTENANCE COMMANDS"
+.TH BLKID 8 "February 2011" "util-linux" "System Administration"
.SH NAME
blkid \- locate/print block device attributes
.SH SYNOPSIS
diff --git a/misc-utils/cal.1 b/misc-utils/cal.1
index 953e82a..4d9b3d1 100644
--- a/misc-utils/cal.1
+++ b/misc-utils/cal.1
@@ -34,14 +34,15 @@
.\"
.\" @(#)cal.1 8.1 (Berkeley) 6/6/93
.\"
-.TH CAL "1" "June 2011" "util-linux" "User Commands"
+.TH CAL 1 "June 2011" "util-linux" "User Commands"
.SH NAME
-cal \- displays a calendar
+cal \- display a calendar
.SH SYNOPSIS
.B cal
[\fIoptions\fR] [[[\fIday\fR] \fImonth\fR] \fIyear\fR]
.SH DESCRIPTION
-Cal displays a simple calendar. If arguments are not specified, the current
+.B cal
+displays a simple calendar. If no arguments are specified, the current
month is displayed.
.SH OPTIONS
.TP
diff --git a/misc-utils/chkdupexe.1 b/misc-utils/chkdupexe.1
index 279562e..dd3664a 100644
--- a/misc-utils/chkdupexe.1
+++ b/misc-utils/chkdupexe.1
@@ -24,7 +24,7 @@
.\" Formatted or processed versions of this manual, if unaccompanied by
.\" the source, must acknowledge the copyright and authors of this work.
.\"
-.TH CHKDUPEXE 1 "11 Mar 1995" "" "Linux Programmer's Manual"
+.TH CHKDUPEXE 1 "March 1995" "util-linux" "User Commands"
.SH NAME
chkdupexe \- find duplicate executables
.SH SYNOPSIS
diff --git a/misc-utils/ddate.1 b/misc-utils/ddate.1
index b14e6b3..0b01e09 100644
--- a/misc-utils/ddate.1
+++ b/misc-utils/ddate.1
@@ -1,8 +1,8 @@
.\" All Rites Reversed. This file is in the PUBLIC DOMAIN.
.\" Kallisti.
-.TH DDATE 1 "59 Bureaucracy 3161" "" "Emperor Norton Utilities"
+.TH DDATE 1 "Bureaucracy 3161" "util-linux" "Emperor Norton User Command"
.SH NAME
-ddate \- converts Gregorian dates to Discordian dates
+ddate \- convert Gregorian dates to Discordian dates
.SH SYNOPSIS
.B ddate
.RI [ \fB+\fPformat]
diff --git a/misc-utils/findfs.8 b/misc-utils/findfs.8
index 92db09d..b754903 100644
--- a/misc-utils/findfs.8
+++ b/misc-utils/findfs.8
@@ -2,7 +2,7 @@
.\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH FINDFS 8 "February 2009" "Linux" "MAINTENANCE COMMANDS"
+.TH FINDFS 8 "February 2009" "util-linux" "System Administration"
.SH NAME
findfs \- find a filesystem by label or UUID
.SH SYNOPSIS
diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 27d85c6..776bf66 100644
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH FINDMNT 8 "Apr 2010" "Version 1.0"
+.TH FINDMNT 8 "April 2010" "util-linux" "System Administration"
.SH NAME
findmnt \- find a filesystem
.SH SYNOPSIS
diff --git a/misc-utils/kill.1 b/misc-utils/kill.1
index 07cbdae..09d30e9 100644
--- a/misc-utils/kill.1
+++ b/misc-utils/kill.1
@@ -1,7 +1,7 @@
.\" Copyright 1994 Salvatore Valente (svalente@mit.edu)
.\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu)
.\" May be distributed under the GNU General Public License
-.TH KILL 1 "14 October 1994" "Linux Utilities" "Linux Programmer's Manual"
+.TH KILL 1 "February 2011" "util-linux" "User Commands"
.SH NAME
kill \- terminate a process
.SH SYNOPSIS
diff --git a/misc-utils/logger.1 b/misc-utils/logger.1
index af826ef..98a1a06 100644
--- a/misc-utils/logger.1
+++ b/misc-utils/logger.1
@@ -33,9 +33,9 @@
.\"
.\" Section on valid facility and level strings added by
.\" and1000@debian.org, 26 Oct 1997.
-.Dd June 6, 1993
+.Dd August 2011
.Dt LOGGER 1
-.Os BSD 4.3
+.Os util-linux
.Sh NAME
.Nm logger
.Nd a shell command interface to the syslog(3) system log module
diff --git a/misc-utils/look.1 b/misc-utils/look.1
index a6ab568..bed3d24 100644
--- a/misc-utils/look.1
+++ b/misc-utils/look.1
@@ -31,7 +31,7 @@
.\"
.\" @(#)look.1 8.1 (Berkeley) 6/14/93
.\"
-.TH LOOK "1" "June 2011" "util-linux" "User Commands"
+.TH LOOK 1 "June 2011" "util-linux" "User Commands"
.SH NAME
look \- display lines beginning with a given string
.SH SYNOPSIS
diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
index 2fcc7e5..1e9b4cf 100644
--- a/misc-utils/lsblk.8
+++ b/misc-utils/lsblk.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH LSBLK 8 "Apr 2010" "Version 1.0"
+.TH LSBLK 8 "April 2010" "util-linux" "System Administration"
.SH NAME
lsblk \- list block devices
.SH SYNOPSIS
diff --git a/misc-utils/namei.1 b/misc-utils/namei.1
index 8e97c18..88e249d 100644
--- a/misc-utils/namei.1
+++ b/misc-utils/namei.1
@@ -1,9 +1,9 @@
.\"
.\" Version 1.4 of namei
.\"
-.TH NAMEI 1 "Local"
+.TH NAMEI 1 "June 2011" "util-linux" "User Commands"
.SH NAME
-namei - follow a pathname until a terminal point is found
+namei \- follow a pathname until a terminal point is found
.SH SYNOPSIS
.B namei
.RI [ options ]
diff --git a/misc-utils/rename.1 b/misc-utils/rename.1
index d2c3d14..0cfe381 100644
--- a/misc-utils/rename.1
+++ b/misc-utils/rename.1
@@ -1,7 +1,7 @@
.\" Written by Andries E. Brouwer (aeb@cwi.nl)
.\" Placed in the public domain
.\"
-.TH RENAME "1" "June 2011" "util-linux" "User Commands"
+.TH RENAME 1 "June 2011" "util-linux" "User Commands"
.SH NAME
rename \- rename files
.SH SYNOPSIS
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index 60e0150..f1022fd 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -2,7 +2,7 @@
.\" Copyright 2007 by Theodore Ts'o. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH UUIDD "8" "June 2011" "util-linux" "System Administration Utilities"
+.TH UUIDD 8 "June 2011" "util-linux" "System Administration"
.SH NAME
uuidd \- UUID generation daemon
.SH SYNOPSIS
diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1
index 92dc2d4..6349b3a 100644
--- a/misc-utils/uuidgen.1
+++ b/misc-utils/uuidgen.1
@@ -5,9 +5,9 @@
.\" This file may be copied under the terms of the GNU Public License.
.\"
.\" Created Wed Mar 10 17:42:12 1999, Andreas Dilger
-.TH UUIDGEN "1" "June 2011" "util-linux" "User Commands"
+.TH UUIDGEN 1 "June 2011" "util-linux" "User Commands"
.SH NAME
-uuidgen \- command\-line utility to create a new UUID value
+uuidgen \- create a new UUID value
.SH SYNOPSIS
.B uuidgen
[\fIoptions\fR]
diff --git a/misc-utils/whereis.1 b/misc-utils/whereis.1
index 57bfb0b..dbf8d2f 100644
--- a/misc-utils/whereis.1
+++ b/misc-utils/whereis.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)whereis.1 from UCB 4.2
-.TH WHEREIS 1 "8 May 1994"
+.TH WHEREIS 1 "July 2009" "util-linux" "User Commands"
.SH NAME
whereis \- locate the binary, source, and manual page files for a command
.SH SYNOPSIS
diff --git a/misc-utils/wipefs.8 b/misc-utils/wipefs.8
index 00a406d..1f3d996 100644
--- a/misc-utils/wipefs.8
+++ b/misc-utils/wipefs.8
@@ -2,7 +2,7 @@
.\" Copyright 2009 by Karel Zak. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH WIPEFS 8 "October 2009" "Linux" "MAINTENANCE COMMANDS"
+.TH WIPEFS 8 "October 2009" "util-linux" "System Administration"
.SH NAME
wipefs \- wipe a filesystem signature from a device
.SH SYNOPSIS
diff --git a/mount/fstab.5 b/mount/fstab.5
index 09bcb38..b0cd763 100644
--- a/mount/fstab.5
+++ b/mount/fstab.5
@@ -40,7 +40,7 @@
.\" Tue Jun 15 20:02:18 1999: added LABEL and UUID
.\" Sat Jul 14 2001: Michael K. Johnson <johnsonm@redhat.com> added -O
.\"
-.TH FSTAB 5 "August 2010" "Linux 2.6" "Linux Programmer's Manual"
+.TH FSTAB 5 "August 2010" "util-linux" "File Formats"
.SH NAME
fstab \- static information about the filesystems
.SH SYNOPSIS
diff --git a/mount/losetup.8 b/mount/losetup.8
index d329c91..f1db80b 100644
--- a/mount/losetup.8
+++ b/mount/losetup.8
@@ -1,4 +1,4 @@
-.TH LOSETUP 8 "2003-07-01" "Linux" "MAINTENANCE COMMANDS"
+.TH LOSETUP 8 "July 2003" "util-linux" "System Administration"
.SH NAME
losetup \- set up and control loop devices
.SH SYNOPSIS
diff --git a/mount/mount.8 b/mount/mount.8
index b1666cb..e403c1a 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -39,7 +39,7 @@
.\" 010725, Nikita Danilov <NikitaDanilov@Yahoo.COM>: reiserfs options
.\" 011124, Karl Eichwalder <ke@gnu.franken.de>: tmpfs options
.\"
-.TH MOUNT 8 "2004-12-16" "Linux 2.6" "Linux Programmer's Manual"
+.TH MOUNT 8 "December 2004" "util-linux" "System Administration"
.SH NAME
mount \- mount a filesystem
.SH SYNOPSIS
diff --git a/mount/swapon.8 b/mount/swapon.8
index 709443c..ee6a2fc 100644
--- a/mount/swapon.8
+++ b/mount/swapon.8
@@ -38,7 +38,7 @@
.\" Mon Sep 25 14:12:38 1995: Added -v and -p information
.\" Tue Apr 30 03:32:07 1996: Added some text from A. Koppenhoefer
.\"
-.TH SWAPON 8 "25 September 1995" "Linux 1.x" "Linux Programmer's Manual"
+.TH SWAPON 8 "September 1995" "util-linux" "System Administration"
.SH NAME
swapon, swapoff \- enable/disable devices and files for paging and swapping
.SH SYNOPSIS
diff --git a/mount/umount.8 b/mount/umount.8
index 4bce485..934fb00 100644
--- a/mount/umount.8
+++ b/mount/umount.8
@@ -23,7 +23,7 @@
.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
.\" USA.
.\"
-.TH UMOUNT 8 "26 July 1997" "Linux 2.0" "Linux Programmer's Manual"
+.TH UMOUNT 8 "March 2010" "util-linux" "System Administration"
.SH NAME
umount \- unmount file systems
.SH SYNOPSIS
diff --git a/partx/addpart.8 b/partx/addpart.8
index 1c92809..9dcd0a3 100644
--- a/partx/addpart.8
+++ b/partx/addpart.8
@@ -2,7 +2,7 @@
.\" Copyright 2007 Karel Zak <kzak@redhat.com>
.\" Copyright 2007 Red Hat, Inc.
.\" May be distributed under the GNU General Public License
-.TH ADDPART 8 "11 Jan 2007"
+.TH ADDPART 8 "January 2007" "util-linux" "System Administration"
.SH NAME
addpart \-
simple wrapper around the "add partition" ioctl
diff --git a/partx/delpart.8 b/partx/delpart.8
index 7f35fb9..433582f 100644
--- a/partx/delpart.8
+++ b/partx/delpart.8
@@ -2,7 +2,7 @@
.\" Copyright 2007 Karel Zak <kzak@redhat.com>
.\" Copyright 2007 Red Hat, Inc.
.\" May be distributed under the GNU General Public License
-.TH DELPART 8 "11 Jan 2007"
+.TH DELPART 8 "January 2007" "util-linux" "System Administration"
.SH NAME
delpart \-
simple wrapper around the "del partition" ioctl
diff --git a/partx/partx.8 b/partx/partx.8
index c680d51..4129d78 100644
--- a/partx/partx.8
+++ b/partx/partx.8
@@ -3,7 +3,7 @@
.\" Copyright 2007 Red Hat, Inc.
.\" Copyright 2010 Davidlohr Bueso <dave@gnu.org>
.\" May be distributed under the GNU General Public License
-.TH PARTX 8 "1 Feb 2011"
+.TH PARTX 8 "February 2011" "util-linux" "System Administration"
.SH NAME
partx \-
tell the Linux kernel about the presence and numbering of on-disk partitions
diff --git a/schedutils/chrt.1 b/schedutils/chrt.1
index e7f2c3e..eb3e90b 100644
--- a/schedutils/chrt.1
+++ b/schedutils/chrt.1
@@ -25,9 +25,9 @@
.\" 2002-05-11 Robert Love <rml@tech9.net>
.\" Initial version
.\"
-.TH CHRT "1" "June 2010" "schedutils" "Linux User's Manual"
+.TH CHRT 1 "June 2010" "util-linux" "User Commands"
.SH NAME
-chrt \- manipulate real-time attributes of a process
+chrt \- manipulate the real-time attributes of a process
.SH SYNOPSIS
.B chrt
.RI [ options ]\ prio
@@ -39,7 +39,7 @@ chrt \- manipulate real-time attributes of a process
.RI [ prio ]\ pid
.SH DESCRIPTION
.PP
-.BR chrt
+.B chrt
sets or retrieves the real-time scheduling attributes of an existing \fIpid\fR,
or runs \fIcommand\fR with the given attributes. Both policy (one of
.BR SCHED_OTHER ,
diff --git a/schedutils/ionice.1 b/schedutils/ionice.1
index c6f0b47..acf6c92 100644
--- a/schedutils/ionice.1
+++ b/schedutils/ionice.1
@@ -1,6 +1,6 @@
-.TH IONICE "1" "July 2011" "util-linux" "User Commands"
+.TH IONICE 1 "July 2011" "util-linux" "User Commands"
.SH NAME
-ionice \- sets or gets process I/O scheduling class and priority
+ionice \- set or get process I/O scheduling class and priority
.SH SYNOPSIS
.B ionice
[[ \fB\-c\fR
diff --git a/schedutils/taskset.1 b/schedutils/taskset.1
index 9300fb3..8917c66 100644
--- a/schedutils/taskset.1
+++ b/schedutils/taskset.1
@@ -25,7 +25,7 @@
.\" 2002-05-11 Robert Love <rml@tech9.net>
.\" Initial version
.\"
-.TH TASKSET "1" "Apr 2003" "schedutils" "Linux User's Manual"
+.TH TASKSET 1 "April 2003" "util-linux" "User Commands"
.SH NAME
taskset \- retrieve or set a process's CPU affinity
.SH SYNOPSIS
@@ -39,7 +39,7 @@ taskset \- retrieve or set a process's CPU affinity
.RI [ mask ]\ pid
.SH DESCRIPTION
.PP
-.BR taskset
+.B taskset
is used to set or retrieve the CPU affinity of a running process given its PID
or to launch a new COMMAND with a given CPU affinity. CPU affinity is a
scheduler property that "bonds" a process to a given set of CPUs on the system.
diff --git a/sys-utils/arch.1 b/sys-utils/arch.1
index 81b6b1e..96cbc0a 100644
--- a/sys-utils/arch.1
+++ b/sys-utils/arch.1
@@ -1,18 +1,18 @@
.\" arch.1 --
.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
.\" Public domain: may be freely distributed.
-.TH ARCH 1 "4 July 1997" "Linux 2.0" "Linux Programmer's Manual"
+.TH ARCH 1 "July 1997" "util-linux" "User Commands"
.SH NAME
arch \- print machine architecture
.SH SYNOPSIS
.B arch
.SH DESCRIPTION
.B arch
-is deprecated command since release util-linux 2.13. Use
-.BR "uname -m"
+is a deprecated command since util-linux 2.13. Use
+.B "uname -m"
or use
-.BR arch
-from the coreutils package.
+.B arch
+from the GNU coreutils package.
On current Linux systems,
.B arch
diff --git a/sys-utils/ctrlaltdel.8 b/sys-utils/ctrlaltdel.8
index bf006e3..4238d98 100644
--- a/sys-utils/ctrlaltdel.8
+++ b/sys-utils/ctrlaltdel.8
@@ -1,6 +1,6 @@
.\" Copyright 1992, 1993 Rickard E. Faith (faith@cs.unc.edu)
.\" May be distributed under the GNU General Public License
-.TH CTRLALTDEL 8 "25 October 1993" "Linux 1.2" "Linux Programmer's Manual"
+.TH CTRLALTDEL 8 "October 1993" "util-linux" "System Administration"
.SH NAME
ctrlaltdel \- set the function of the Ctrl-Alt-Del combination
.SH SYNOPSIS
diff --git a/sys-utils/cytune.8 b/sys-utils/cytune.8
index a1235b1..8a21775 100644
--- a/sys-utils/cytune.8
+++ b/sys-utils/cytune.8
@@ -24,9 +24,9 @@
.\" Formatted or processed versions of this manual, if unaccompanied by
.\" the source, must acknowledge the copyright and authors of this work.
.\" "
-.TH CYTUNE 8 " 4 Mar 1995" "" "Linux Programmer's Manual"
+.TH CYTUNE 8 "March 1995" "util-linux" "System Administration"
.SH NAME
-cytune \- Tune driver parameters for Cyclades-Z multiport serial card
+cytune \- tune driver parameters for Cyclades-Z multiport serial card
.SH SYNOPSIS
.B cytune
.RB [ \-q
diff --git a/sys-utils/dmesg.1 b/sys-utils/dmesg.1
index 4531edb..3dc18cb 100644
--- a/sys-utils/dmesg.1
+++ b/sys-utils/dmesg.1
@@ -1,6 +1,6 @@
.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
.\" May be distributed under the GNU General Public License
-.TH DMESG 1 "Jul 2011"
+.TH DMESG 1 "July 2011" "util-linux" "User Commands"
.SH NAME
dmesg \- print or control the kernel ring buffer
.SH SYNOPSIS
diff --git a/sys-utils/fallocate.1 b/sys-utils/fallocate.1
index 003cb55..2020437 100644
--- a/sys-utils/fallocate.1
+++ b/sys-utils/fallocate.1
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
-.TH FALLOCATE 1 "Jul 2009" "Version 1.0"
+.TH FALLOCATE 1 "July 2009" "util-linux" "User Commands"
.SH NAME
-fallocate \- preallocate space to a file.
+fallocate \- preallocate space to a file
.SH SYNOPSIS
.B fallocate
.RB [ \-n ]
diff --git a/sys-utils/flock.1 b/sys-utils/flock.1
index 55be5d8..3d7e10c 100644
--- a/sys-utils/flock.1
+++ b/sys-utils/flock.1
@@ -24,9 +24,9 @@
.\" OTHER DEALINGS IN THE SOFTWARE.
.\"
.\" -----------------------------------------------------------------------
-.TH FLOCK "1" "4 Feb 2006" "flock utility" "H. Peter Anvin"
+.TH FLOCK 1 "February 2006" "util-linux" "User Commands"
.SH NAME
-flock \- Manage locks from shell scripts
+flock \- manage locks from shell scripts
.SH SYNOPSIS
\fBflock\fP [\fB\-sxon\fP] [\fB\-w\fP \fItimeout\fP] \fIlockfile\fP [\fB\-c\fP] \fIcommand...\fP
.PP
diff --git a/sys-utils/fsfreeze.8 b/sys-utils/fsfreeze.8
index a10c053..7693861 100644
--- a/sys-utils/fsfreeze.8
+++ b/sys-utils/fsfreeze.8
@@ -1,14 +1,12 @@
.\" -*- nroff -*-
-.TH FSFREEZE 8 "May 2010"
+.TH FSFREEZE 8 "May 2010" "util-linux" "System Administration"
.SH NAME
-fsfreeze \- suspend access to an filesystem (Linux Ext3/4, ReiserFS, JFS, XFS).
+fsfreeze \- suspend access to a filesystem (Linux Ext3/4, ReiserFS, JFS, XFS)
.SH SYNOPSIS
-.B fsfreeze
-.RB \-f
+.B fsfreeze \-f
.I mountpoint
-.B fsfreeze
-.RB \-u
+.B fsfreeze \-u
.I mountpoint
.SH DESCRIPTION
diff --git a/sys-utils/fstrim.8 b/sys-utils/fstrim.8
index 1bca53b..18b5eaf 100644
--- a/sys-utils/fstrim.8
+++ b/sys-utils/fstrim.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH FSTRIM 8 "Nov 2010"
+.TH FSTRIM 8 "November 2010" "util-linux" "System Administration"
.SH NAME
fstrim \- discard unused blocks on a mounted filesystem
.SH SYNOPSIS
diff --git a/sys-utils/ipcmk.1 b/sys-utils/ipcmk.1
index afeacaf..eada9bb 100644
--- a/sys-utils/ipcmk.1
+++ b/sys-utils/ipcmk.1
@@ -1,6 +1,6 @@
.\" Copyright 2008 Hayden A. James (hayden.james@gmail.com)
.\" May be distributed under the GNU General Public License
-.TH "IPCMK" "1" "21 March 2008" "ipcmk" "Linux Programmer's Manual"
+.TH IPCMK 1 "March 2008" "util-linux" "User Commands"
.SH "NAME"
ipcmk \- create various ipc resources
.SH "SYNOPSIS"
diff --git a/sys-utils/ipcrm.1 b/sys-utils/ipcrm.1
index 7806f6f..d555745 100644
--- a/sys-utils/ipcrm.1
+++ b/sys-utils/ipcrm.1
@@ -1,6 +1,6 @@
.\" Copyright 2002 Andre C. Mazzone (linuxdev@karagee.com)
.\" May be distributed under the GNU General Public License
-.TH IPCRM 1 "last change: 19 March 2002" "ipcrm" "Linux Programmer's Manual"
+.TH IPCRM 1 "March 2002" "util-linux" "User Commands"
.SH NAME
ipcrm \- remove a message queue, semaphore set or shared memory id
.SH SYNOPSIS
diff --git a/sys-utils/ipcs.1 b/sys-utils/ipcs.1
index 76e50ac..652c0f3 100644
--- a/sys-utils/ipcs.1
+++ b/sys-utils/ipcs.1
@@ -1,6 +1,6 @@
.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
.\" May be distributed under the GNU General Public License
-.TH IPCS 1 "9 October 1993" "Linux 0.99" "Linux Programmer's Manual"
+.TH IPCS 1 "February 2008" "util-linux" "User Commands"
.SH NAME
ipcs \- provide information on ipc facilities
.SH SYNOPSIS
diff --git a/sys-utils/ldattach.8 b/sys-utils/ldattach.8
index 7e57fec..8ce14f3 100644
--- a/sys-utils/ldattach.8
+++ b/sys-utils/ldattach.8
@@ -1,6 +1,6 @@
.\" Copyright 2008 Tilman Schmidt (tilman@imap.cc)
.\" May be distributed under the GNU General Public License version 2 or later
-.TH LDATTACH 8 "14 February 2010" "Linux 2.6" "Linux Programmer's Manual"
+.TH LDATTACH 8 "February 2010" "util-linux" "System Administration"
.SH NAME
ldattach \- attach a line discipline to a serial line
.SH SYNOPSIS
diff --git a/sys-utils/lscpu.1 b/sys-utils/lscpu.1
index 4795e91..056e7a9 100644
--- a/sys-utils/lscpu.1
+++ b/sys-utils/lscpu.1
@@ -1,9 +1,9 @@
.\" Process this file with
.\" groff -man -Tascii lscpu.1
.\"
-.TH LSCPU 1 "February 2011" Linux "User Manuals"
+.TH LSCPU 1 "February 2011" "util-linux" "User Commands"
.SH NAME
-lscpu \- CPU architecture information helper
+lscpu \- display information on CPU architecture
.SH SYNOPSIS
.B lscpu
.RB [ \-hpx ]
diff --git a/sys-utils/mountpoint.1 b/sys-utils/mountpoint.1
index be17c42..3c7d084 100644
--- a/sys-utils/mountpoint.1
+++ b/sys-utils/mountpoint.1
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH MOUNTPOINT 1 "June 2011"
+.TH MOUNTPOINT 1 "June 2011" "util-linux" "User Commands"
.SH NAME
mountpoint \- see if a directory is a mountpoint
.SH SYNOPSIS
diff --git a/sys-utils/pivot_root.8 b/sys-utils/pivot_root.8
index 50c1768..2260957 100644
--- a/sys-utils/pivot_root.8
+++ b/sys-utils/pivot_root.8
@@ -1,6 +1,6 @@
-.TH PIVOT_ROOT 8 "Feb 23, 2000" "Linux" "Maintenance Commands"
+.TH PIVOT_ROOT 8 "February 2000" "util-linux" "System Administration"
.SH NAME
-pivot_root \- change the root file system
+pivot_root \- change the root filesystem
.SH SYNOPSIS
.B pivot_root
.I new_root put_old
diff --git a/sys-utils/readprofile.1 b/sys-utils/readprofile.1
index a1ae951..0be5dca 100644
--- a/sys-utils/readprofile.1
+++ b/sys-utils/readprofile.1
@@ -1,7 +1,7 @@
-.TH READPROFILE 1 "May 1996"
+.TH READPROFILE 1 "May 1996" "util-linux" "User Commands"
.UC 4
.SH NAME
-readprofile - a tool to read kernel profiling information
+readprofile - read kernel profiling information
.SH SYNOPSIS
.B readprofile
.RI [ options ]
diff --git a/sys-utils/renice.1 b/sys-utils/renice.1
index a06f549..f283645 100644
--- a/sys-utils/renice.1
+++ b/sys-utils/renice.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)renice.8 8.1 (Berkeley) 6/9/93
.\"
-.Dd June 9, 1993
+.Dd November 2010
.Dt RENICE 1
-.Os BSD 4
+.Os util-linux
.Sh NAME
.Nm renice
.Nd alter priority of running processes
diff --git a/sys-utils/rtcwake.8 b/sys-utils/rtcwake.8
index 8bfd90d..a536f32 100644
--- a/sys-utils/rtcwake.8
+++ b/sys-utils/rtcwake.8
@@ -16,7 +16,7 @@
.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
.\" 02110-1301, USA.
.\"
-.TH rtcwake 8 "2007-07-13" "" "Linux Programmer's Manual"
+.TH RTCWAKE 8 "July 2007" "util-linux" "System Administration"
.SH NAME
rtcwake - enter a system sleep state until specified wakeup time
.SH SYNOPSIS
diff --git a/sys-utils/setarch.8 b/sys-utils/setarch.8
index 4bb2b03..0764a45 100644
--- a/sys-utils/setarch.8
+++ b/sys-utils/setarch.8
@@ -1,4 +1,4 @@
-.TH SETARCH 8 "Jun 2007" setarch "Linux Programmer's Manual"
+.TH SETARCH 8 "June 2007" "util-linux" "System Administration"
.SH NAME
setarch \- change reported architecture in new program environment and set personality flags
.SH SYNOPSIS
diff --git a/sys-utils/setsid.1 b/sys-utils/setsid.1
index 7a14da3..0d9580e 100644
--- a/sys-utils/setsid.1
+++ b/sys-utils/setsid.1
@@ -1,7 +1,7 @@
.\" Rick Sladkey <jrs@world.std.com>
.\" In the public domain.
.\" Path modifications by faith@cs.unc.edu
-.TH SETSID 1 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual"
+.TH SETSID 1 "November 1993" "util-linux" "User Commands"
.SH NAME
setsid \- run a program in a new session
.SH SYNOPSIS
diff --git a/sys-utils/switch_root.8 b/sys-utils/switch_root.8
index 0f0f9e5..34ab0d0 100644
--- a/sys-utils/switch_root.8
+++ b/sys-utils/switch_root.8
@@ -1,7 +1,7 @@
.\" Karel Zak <kzak@redhat.com>
-.TH SWITCH_ROOT 8 "June 2009" "Linux"
+.TH SWITCH_ROOT 8 "June 2009" "util-linux" "System Administration"
.SH NAME
-switch_root \- switch to another filesystem as the root of the mount tree.
+switch_root \- switch to another filesystem as the root of the mount tree
.SH SYNOPSIS
.B switch_root
.RB [ \-hV ]
diff --git a/sys-utils/tunelp.8 b/sys-utils/tunelp.8
index 9ed4452..8a7049b 100644
--- a/sys-utils/tunelp.8
+++ b/sys-utils/tunelp.8
@@ -5,7 +5,7 @@
.\" Public license for conditions under which this file may be redistributed.
.\"
.\" Polished a bit - aeb
-.TH tunelp 8 "7 May 1999" "tunelp" "Linux Programmer's Manual"
+.TH TUNELP 8 "May 1999" "util-linux" "System Administration"
.SH NAME
tunelp \- set various parameters for the lp device
.SH SYNOPSIS
diff --git a/sys-utils/unshare.1 b/sys-utils/unshare.1
index d27c35e..5ee03ee 100644
--- a/sys-utils/unshare.1
+++ b/sys-utils/unshare.1
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii lscpu.1
.\"
-.TH UNSHARE 1 "OCTOBER 2008" Linux "User Manuals"
+.TH UNSHARE 1 "October 2008" "util-linux" "User Commands"
.SH NAME
unshare \- run program with some namespaces unshared from parent
.SH SYNOPSIS
diff --git a/term-utils/agetty.8 b/term-utils/agetty.8
index c43f456..4083291 100644
--- a/term-utils/agetty.8
+++ b/term-utils/agetty.8
@@ -1,4 +1,4 @@
-.TH AGETTY 8
+.TH AGETTY 8 "May 2011" "util-linux" "System Administration"
.SH NAME
agetty \- alternative Linux getty
diff --git a/term-utils/mesg.1 b/term-utils/mesg.1
index 5b0ed43..f7e2f3d 100644
--- a/term-utils/mesg.1
+++ b/term-utils/mesg.1
@@ -36,7 +36,7 @@
.\"
.\"
.\" "
-.TH MESG 1 "10 March 1995" "Linux 1.2" "Linux Programmer's Manual"
+.TH MESG 1 "April 2011" "util-linux" "User Commands"
.SH NAME
mesg \- display (do not display) messages from other users
.SH SYNOPSIS
diff --git a/term-utils/reset.1 b/term-utils/reset.1
index 1e2f0f3..fdf67e2 100644
--- a/term-utils/reset.1
+++ b/term-utils/reset.1
@@ -1,6 +1,6 @@
.\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu)
.\" May be distributed under the GNU General Public License
-.TH RESET 1 "10 October 1993" "Linux 0.99" "Linux Programmer's Manual"
+.TH RESET 1 "October 1993" "util-linux" "User Commands"
.SH NAME
reset \- reset the terminal
.SH SYNOPSIS
diff --git a/term-utils/script.1 b/term-utils/script.1
index 5f96b9c..e111d08 100644
--- a/term-utils/script.1
+++ b/term-utils/script.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)script.1 6.5 (Berkeley) 7/27/91
.\"
-.Dd Feb 20, 2011
+.Dd February 2011
.Dt SCRIPT 1
-.Os Linux
+.Os util-linux
.Sh NAME
.Nm script
.Nd make typescript of terminal session
diff --git a/term-utils/scriptreplay.1 b/term-utils/scriptreplay.1
index 5610eb1..184ff19 100644
--- a/term-utils/scriptreplay.1
+++ b/term-utils/scriptreplay.1
@@ -138,7 +138,7 @@
.\" ======================================================================
.\"
.IX Title "REPLAY 1"
-.TH REPLAY 1 "perl v5.6.0" "2001-09-03" "User Contributed Perl Documentation"
+.TH REPLAY 1 "September 2001" "util-linux" "User Commands"
.UC
.SH "NAME"
scriptreplay \- play back typescripts, using timing information
diff --git a/term-utils/setterm.1 b/term-utils/setterm.1
index e5b3bb4..3eac348 100644
--- a/term-utils/setterm.1
+++ b/term-utils/setterm.1
@@ -8,7 +8,7 @@
.\" Undocumented: -snow, -softscroll, -standout; these are
.\" commented out in the source
.\"
-.TH SETTERM 1 "7 January 2000" "Util-Linux 2.10" "Linux Programmer's Manual"
+.TH SETTERM 1 "January 2000" "util-linux" "User Commands"
.SH NAME
setterm \- set terminal attributes
.SH SYNOPSIS
diff --git a/term-utils/wall.1 b/term-utils/wall.1
index b3b2aa5..541a8d0 100644
--- a/term-utils/wall.1
+++ b/term-utils/wall.1
@@ -33,9 +33,9 @@
.\"
.\" Modified for Linux, Mon Mar 8 18:07:38 1993, faith@cs.unc.edu
.\"
-.Dd March 8, 1993
+.Dd April 2011
.Dt WALL 1
-.Os "Linux 0.99"
+.Os util-linux
.Sh NAME
.Nm wall
.Nd write a message to users
diff --git a/term-utils/write.1 b/term-utils/write.1
index 1c15f50..b606575 100644
--- a/term-utils/write.1
+++ b/term-utils/write.1
@@ -36,7 +36,7 @@
.\"
.\" Modified for Linux, Sun Mar 12 10:21:01 1995, faith@cs.unc.edu
.\"
-.TH WRITE 1 "12 March 1995" "" "Linux Programmer's Manual"
+.TH WRITE 1 "March 1995" "util-linux" "User Commands"
.SH NAME
write \- send a message to another user
.SH SYNOPSIS
diff --git a/text-utils/col.1 b/text-utils/col.1
index fab02d6..d9879d5 100644
--- a/text-utils/col.1
+++ b/text-utils/col.1
@@ -34,9 +34,9 @@
.\"
.\" @(#)col.1 6.8 (Berkeley) 6/17/91
.\"
-.Dd June 17, 1991
+.Dd May 2011
.Dt COL 1
-.Os
+.Os util-linux
.Sh NAME
.Nm col
.Nd filter reverse line feeds from input
diff --git a/text-utils/colcrt.1 b/text-utils/colcrt.1
index b079a38..e65c8e9 100644
--- a/text-utils/colcrt.1
+++ b/text-utils/colcrt.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)colcrt.1 8.1 (Berkeley) 6/30/93
.\"
-.Dd June 30, 1993
+.Dd May 2011
.Dt COLCRT 1
-.Os BSD 3
+.Os util-linux
.Sh NAME
.Nm colcrt
.Nd filter nroff output for CRT previewing
diff --git a/text-utils/colrm.1 b/text-utils/colrm.1
index 04a41b1..38c4f4e 100644
--- a/text-utils/colrm.1
+++ b/text-utils/colrm.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)colrm.1 6.6 (Berkeley) 3/14/91
.\"
-.Dd March 14, 1991
+.Dd May 2011
.Dt COLRM 1
-.Os BSD 3
+.Os util-linux
.Sh NAME
.Nm colrm
.Nd remove columns from a file
diff --git a/text-utils/column.1 b/text-utils/column.1
index ebeb1e3..2050666 100644
--- a/text-utils/column.1
+++ b/text-utils/column.1
@@ -31,7 +31,7 @@
.\"
.\" @(#)column.1 8.1 (Berkeley) 6/6/93
.\"
-.TH COLUMN 1 "Local"
+.TH COLUMN 1 "October 2010" "util-linux" "User Commands"
.SH NAME
column - columnate lists
.SH SYNOPSIS
@@ -39,9 +39,11 @@ column - columnate lists
.RI [ options ]
.IR file ...
.SH DESCRIPTION
-The column utility formats its input into multiple columns. Rows
-are filled before columns. Input is taken from file or, by
-default, from the standard input. Empty lines are ignored.
+The
+.B column
+utility formats its input into multiple columns. Rows
+are filled before columns. Input is taken from \fIfile\fR or, by
+default, from standard input. Empty lines are ignored.
.PP
.SH OPTIONS
.IP "\fB\-c, \-\-columns\fP \fIwidth\fP"
diff --git a/text-utils/hexdump.1 b/text-utils/hexdump.1
index a5e2a8c..20dbad2 100644
--- a/text-utils/hexdump.1
+++ b/text-utils/hexdump.1
@@ -31,9 +31,9 @@
.\"
.\" from: @(#)hexdump.1 8.2 (Berkeley) 4/18/94
.\"
-.Dd April 18, 1994
+.Dd July 2009
.Dt HEXDUMP 1
-.Os
+.Os util-linux
.Sh NAME
.Nm hexdump
.Nd ascii, decimal, hexadecimal, octal dump
diff --git a/text-utils/line.1 b/text-utils/line.1
index 1cd0aa7..6305f6b 100644
--- a/text-utils/line.1
+++ b/text-utils/line.1
@@ -1,12 +1,12 @@
.\" This page is in the public domain
-.TH LINE 1 "2002-07-07" "" "User Commands"
+.TH LINE 1 "July 2002" "util-linux" "User Commands"
.SH NAME
line \- read one line
.SH SYNOPSIS
.B line
.SH DESCRIPTION
The utility
-.I line
+.B line
copies one line (up to a newline) from standard input to standard output.
It always prints at least a newline and returns an exit status of 1
on EOF or read error.
diff --git a/text-utils/more.1 b/text-utils/more.1
index 1c9a513..73f65a0 100644
--- a/text-utils/more.1
+++ b/text-utils/more.1
@@ -37,9 +37,9 @@
.\" conform with the more 5.19 currently in use by the Linux community.
.\"
.\" .Dd July 29, 1991 (Modified December 25, 1992)
-.Dd December 25, 1992
+.Dd February 2011
.Dt MORE 1
-.Os "Linux 0.98"
+.Os util-linux
.Sh NAME
.Nm more
.Nd file perusal filter for crt viewing
diff --git a/text-utils/pg.1 b/text-utils/pg.1
index 853e5af..22b05f5 100644
--- a/text-utils/pg.1
+++ b/text-utils/pg.1
@@ -1,5 +1,5 @@
.\" @(#)pg.1 1.7 (gritter) 4/25/01
-.TH PG 1 "2001-04-25" "Gunnar Ritter" "User Commands"
+.TH PG 1 "April 2001" "util-linux" "User Commands"
.SH NAME
pg \- browse pagewise through text files
.SH SYNOPSIS
@@ -12,7 +12,7 @@ pg \- browse pagewise through text files
.RB [ +/\fIpattern\fP/ ]
.RI [ file ...]
.SH DESCRIPTION
-.I Pg
+.B pg
displays a text file on a
.SM CRT
one screenful at once.
diff --git a/text-utils/rev.1 b/text-utils/rev.1
index db0eecb..7dc6804 100644
--- a/text-utils/rev.1
+++ b/text-utils/rev.1
@@ -33,9 +33,9 @@
.\" Modified for Linux by Charles Hannum (mycroft@gnu.ai.mit.edu)
.\" and Brian Koehmstedt (bpk@gnu.ai.mit.edu)
.\"
-.Dd March 21, 1992
+.Dd April 2011
.Dt REV 1
-.Os
+.Os util-linux
.Sh NAME
.Nm rev
.Nd reverse lines of a file or files
diff --git a/text-utils/tailf.1 b/text-utils/tailf.1
index e7c9526..d64d2ca 100644
--- a/text-utils/tailf.1
+++ b/text-utils/tailf.1
@@ -22,7 +22,7 @@
.\" Formatted or processed versions of this manual, if unaccompanied by
.\" the source, must acknowledge the copyright and authors of this work.
.\"
-.TH TAILF 1 "13 February 2003" "" "Linux Programmer's Manual"
+.TH TAILF 1 "February 2003" "util-linux" "User Commands"
.SH NAME
tailf \- follow the growth of a log file
.SH SYNOPSIS
diff --git a/text-utils/ul.1 b/text-utils/ul.1
index 7992d72..6d93531 100644
--- a/text-utils/ul.1
+++ b/text-utils/ul.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)ul.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd June 6, 1993
+.Dd August 2011
.Dt UL 1
-.Os BSD 4
+.Os util-linux
.Sh NAME
.Nm ul
.Nd do underlining
--
1.7.0.4
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-uuidd-man-page-repair-the-snipped-up-description-of-.patch --]
[-- Type: text/x-patch; name="0002-uuidd-man-page-repair-the-snipped-up-description-of-.patch", Size: 3376 bytes --]
From 26b6869d1215b37200cf209e1454bac0a596f9d7 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 19 Aug 2011 22:14:37 +0200
Subject: [PATCH 2/6] uuidd: (man page) repair the snipped up description of option -T
Also use lower case and no equals sign for option arguments,
return to using normal formatting macros, and indent the example.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
misc-utils/uuidd.8 | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index f1022fd..6df4ee5 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -7,7 +7,7 @@
uuidd \- UUID generation daemon
.SH SYNOPSIS
.B uuidd
-[\fIoptions\fR]
+.RI [ options ]
.SH DESCRIPTION
The
.B uuidd
@@ -17,65 +17,65 @@ in a secure and guaranteed-unique fashion, even in the face of large
numbers of threads running on different CPUs trying to grab UUIDs.
.SH OPTIONS
.TP
-\fB\-p\fR, \fB\-\-pid\fR=\fIPATH\fR
+.BR \-p , " \-\-pid " \fIpath\fR
Specify the pathname where the pid file should be written. By default,
the pid file is written to /var/run/uuidd/uuidd.pid.
.TP
-\fB\-s\fR, \fB\-\-socket\fR=\fIPATH\fR
+.BR \-s , " \-\-socket " \fIpath\fR
Specify the pathname used for the unix-domain socket used by uuidd. By
default, the pathname used is /var/run/uuidd/request. This is primarily
for debugging purposes, since the pathname is hard-coded in the libuuid
library.
.TP
-\fB\-T\fR, \fB\-\-timeout\fR=\fISEC\fR
+.BR \-T , " \-\-timeout " \fItimeout\fR
Specify a timeout for uuidd. If specified, then uuidd will exit after
+.I timeout
+seconds of inactivity.
.TP
-\fB\-k\fR, \fB\-\-kill\fR
+.BR \-k , " \-\-kill "
If currently a uuidd daemon is running, kill it.
.TP
-\fB\-r\fR, \fB\-\-random\fR
+.BR \-r , " \-\-random "
Test uuidd by trying to connect to a running uuidd daemon and
request it to return a random-based UUID.
.TP
-\fB\-t\fR, \fB\-\-time\fR
+.BR \-t , " \-\-time "
Test uuidd by trying to connect to a running uuidd daemon and
request it to return a time-based UUID.
.TP
-\fB\-n\fR, \fB\-\-uuids\fR=\fINUM\fR
+.BR \-n , " \-\-uuids " \fInumber\fR
When issuing a test request to a running uuidd, request a bulk response
of
.I number
UUIDs.
.TP
.B \-d
-Run
-.B uuidd
-in debugging mode. This prevents uuidd from running as a daemon.
+Run uuidd in debugging mode. This prevents uuidd from running as a daemon.
.TP
.BI \-q
Suppress some failure messages.
-.I timeout
-seconds of inactivity.
.TP
-\fB\-V\fR, \fB\-\-version\fR
+.BR \-V , " \-\-version "
Output version information and exit.
.TP
-\fB\-h\fR, \fB\-\-help\fR
+.BR \-h , " \-\-help "
Display help screen and exit.
.SH EXAMPLE
-Start up a daemon, print few keys and at the end stop the daemon.
+Start up a daemon, print 42 random keys, and then stop the daemon.
.PP
+.RS
.nf
uuidd -p /tmp/uuidd.pid -s /tmp/uuidd.socket
uuidd -d -r -n 42 -s /tmp/uuidd.socket
uuidd -d -k -s /tmp/uuidd.socket
.nf
+.RE
.SH AUTHOR
The
.B uuidd
daemon was written by Theodore Ts'o <tytso@mit.edu>.
.SH AVAILABILITY
-uuidd is part of the util-linux package and is available from
+The uuidd daemon is part of the util-linux package and is available from
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
.SH "SEE ALSO"
.BR uuid (3),
--
1.7.0.4
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-uuidd-man-page-alphabetize-the-options.patch --]
[-- Type: text/x-patch; name="0003-uuidd-man-page-alphabetize-the-options.patch", Size: 2541 bytes --]
From 1a3ae418f8912afe937ea81c026325e6bef5d2a5 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 19 Aug 2011 22:24:02 +0200
Subject: [PATCH 3/6] uuidd: (man page) alphabetize the options
---
misc-utils/uuidd.8 | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index 6df4ee5..8e82b10 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -17,10 +17,32 @@ in a secure and guaranteed-unique fashion, even in the face of large
numbers of threads running on different CPUs trying to grab UUIDs.
.SH OPTIONS
.TP
+.B \-d
+Run uuidd in debugging mode. This prevents uuidd from running as a daemon.
+.TP
+.BR \-h , " \-\-help "
+Display help screen and exit.
+.TP
+.BR \-k , " \-\-kill "
+If currently a uuidd daemon is running, kill it.
+.TP
+.BR \-n , " \-\-uuids " \fInumber\fR
+When issuing a test request to a running uuidd, request a bulk response
+of
+.I number
+UUIDs.
+.TP
.BR \-p , " \-\-pid " \fIpath\fR
Specify the pathname where the pid file should be written. By default,
the pid file is written to /var/run/uuidd/uuidd.pid.
.TP
+.B \-q
+Suppress some failure messages.
+.TP
+.BR \-r , " \-\-random "
+Test uuidd by trying to connect to a running uuidd daemon and
+request it to return a random-based UUID.
+.TP
.BR \-s , " \-\-socket " \fIpath\fR
Specify the pathname used for the unix-domain socket used by uuidd. By
default, the pathname used is /var/run/uuidd/request. This is primarily
@@ -32,34 +54,12 @@ Specify a timeout for uuidd. If specified, then uuidd will exit after
.I timeout
seconds of inactivity.
.TP
-.BR \-k , " \-\-kill "
-If currently a uuidd daemon is running, kill it.
-.TP
-.BR \-r , " \-\-random "
-Test uuidd by trying to connect to a running uuidd daemon and
-request it to return a random-based UUID.
-.TP
.BR \-t , " \-\-time "
Test uuidd by trying to connect to a running uuidd daemon and
request it to return a time-based UUID.
.TP
-.BR \-n , " \-\-uuids " \fInumber\fR
-When issuing a test request to a running uuidd, request a bulk response
-of
-.I number
-UUIDs.
-.TP
-.B \-d
-Run uuidd in debugging mode. This prevents uuidd from running as a daemon.
-.TP
-.BI \-q
-Suppress some failure messages.
-.TP
.BR \-V , " \-\-version "
Output version information and exit.
-.TP
-.BR \-h , " \-\-help "
-Display help screen and exit.
.SH EXAMPLE
Start up a daemon, print 42 random keys, and then stop the daemon.
.PP
--
1.7.0.4
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-pg-normalize-formatting-of-the-man-page-and-tweak-so.patch --]
[-- Type: text/x-patch; name="0004-pg-normalize-formatting-of-the-man-page-and-tweak-so.patch", Size: 5478 bytes --]
From e5d259c268365457a0f0bd7654aae7d6cfcc0c17 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 19 Aug 2011 22:38:46 +0200
Subject: [PATCH 4/6] pg: normalize formatting of the man page, and tweak some of its wording
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
text-utils/pg.1 | 73 +++++++++++++++++++++++++-----------------------------
1 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/text-utils/pg.1 b/text-utils/pg.1
index 22b05f5..93b0209 100644
--- a/text-utils/pg.1
+++ b/text-utils/pg.1
@@ -16,63 +16,59 @@ pg \- browse pagewise through text files
displays a text file on a
.SM CRT
one screenful at once.
-After each page, a prompt is displayed. The user may then either press the
+After each page, a prompt is displayed. The user may then either press the
newline key to view the next page or one of the keys described below.
.PP
If no filename is given on the command line,
-.I pg
+.B pg
reads from standard input.
-If the standard output is not a terminal,
-.I pg
+If standard output is not a terminal,
+.B pg
acts like
.IR cat (1)
but precedes each file with its name if there is more than one.
.PP
If input comes from a pipe,
-.I pg
+.B pg
stores the data in a buffer file while reading
to make navigation possible.
.SH OPTIONS
-.I Pg
+.B pg
accepts the following options:
.TP
.BI \- number
-The number of lines per page. Usually, this is the number of
+The number of lines per page. Usually, this is the number of
.SM CRT
-lines
-minus one.
+lines minus one.
.TP
.B \-c
-Clear the screen before a page is displayed
+Clear the screen before a page is displayed,
if the terminfo entry for the terminal provides this capability.
.TP
.B \-e
-.I pg
-will not pause and display
+Do not pause and display
.SM (EOF)
at the end of a file.
.TP
.B \-f
-.I pg
-does not split long lines.
+Do not split long lines.
.TP
.B \-n
-Without this option, commands must be terminated by a newline character. With
-this option,
-.I pg
+Without this option, commands must be terminated by a newline character.
+With this option,
+.B pg
advances once a command letter is entered.
.TP
.BI \-p \ string
-Instead of the prompt
-.I " :"
-,
+Instead of the normal prompt
+.IR : ,
.I string
is displayed.
If
.I string
contains
-.I %d
-, its first occurrence is replaced by the number of the current page.
+.IR %d ,
+its first occurrence is replaced by the number of the current page.
.TP
.B \-r
Disallow the shell escape.
@@ -80,7 +76,7 @@ Disallow the shell escape.
.B \-s
Print messages in
.I standout
-mode
+mode,
if the terminfo entry for the terminal provides this capability.
.TP
.BI + number
@@ -91,7 +87,7 @@ Start at the line containing the Basic Regular Expression
.I pattern
given.
.SH USAGE
-The following commands may be entered at the prompt. Commands preceded by
+The following commands may be entered at the prompt. Commands preceded by
.I i
in this document accept a number as argument, positive or negative.
If this argument starts with
@@ -105,7 +101,7 @@ otherwise relative to the beginning.
Display the next or the indicated page.
.TP
\fIi\fR\fBd\fR or \fB^D\fR
-Display the next halfpage. If
+Display the next halfpage. If
.I i
is given, it is always interpreted relative to the current position.
.TP
@@ -135,9 +131,9 @@ Advance to the last line of the input file.
Search forward until the first or the \fIi\fR-th
occurrence of the Basic Regular Expression
.I pattern
-is found. The search starts
-after the current page and stops at the end of the file. No wrap-around is
-performed.
+is found. The search starts
+after the current page and stops at the end of the file.
+No wrap-around is performed.
.I i
must be a positive number.
.TP
@@ -145,13 +141,13 @@ must be a positive number.
Search backward until the first or the \fIi\fR-th
occurrence of the Basic Regular Expression
.I pattern
-is found. The search starts
+is found. The search starts
before the current page and stops at the beginning of the file.
No wrap-around is performed.
.I i
must be a positive number.
.PP
-The search commands accept an added letter. If
+The search commands accept an added letter. If
.B t
is given, the line containing the pattern is displayed at the top of the
screen, which is the default.
@@ -187,17 +183,17 @@ using the shell.
Quit.
.PP
If the user presses the interrupt or quit key while
-.I pg
+.B pg
reads from the
input file or writes on the terminal,
-.I pg
+.B pg
will immediately display the prompt.
In all other situations these keys will terminate
-.I pg.
+.BR pg .
.SH "ENVIRONMENT VARIABLES"
The following environment variables
affect the behaviour of
-.I pg:
+.BR pg :
.TP
.B COLUMNS
Overrides the system-supplied number of columns if set.
@@ -211,8 +207,7 @@ Overrides the system-supplied number of lines if set.
.TP
.B SHELL
Used by the
-.B !
-command.
+.BR ! " command."
.TP
.B TERM
Determines the terminal type.
@@ -225,13 +220,13 @@ Determines the terminal type.
.BR regex (7),
.BR term (7)
.SH NOTES
-.I pg
-expects the terminal tabulators to set on eight positions.
+.B pg
+expects the terminal tabulators to be set every eight positions.
.PP
Files that include
.SM NUL
characters cannot be displayed by
-.IR pg .
+.BR pg .
.SH AVAILABILITY
The pg command is part of the util-linux package and is available from
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
--
1.7.0.4
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: 0005-scriptreplay-improve-synopsis-and-formatting-and-wor.patch --]
[-- Type: text/x-patch; name="0005-scriptreplay-improve-synopsis-and-formatting-and-wor.patch", Size: 2681 bytes --]
From 5707e636a7cb16c88e7092ed97de7df0412543b9 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 20 Aug 2011 11:29:50 +0200
Subject: [PATCH 5/6] scriptreplay: improve synopsis and formatting and wording in man page
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
term-utils/scriptreplay.1 | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/term-utils/scriptreplay.1 b/term-utils/scriptreplay.1
index 184ff19..7788af7 100644
--- a/term-utils/scriptreplay.1
+++ b/term-utils/scriptreplay.1
@@ -145,6 +145,8 @@ scriptreplay \- play back typescripts, using timing information
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
.B scriptreplay
+.RI [ options ]
+.RB [ \-t ]
.I timingfile
.RI [ typescript
.RI [ divisor ]]
@@ -165,7 +167,7 @@ which
.B scriptreplay
is sending its output.
.PP
-The timings information is what
+The timing information is what
.BR script (1)
outputs to standard error if it is
run with the
@@ -173,31 +175,33 @@ run with the
parameter.
.PP
By default, the typescript to display is assumed to be named \*(L"typescript\*(R",
-but other filenames may be specified, as the second parameter.
+but other filenames may be specified, as the second parameter or with option
+.BR \-s .
.PP
-If the third parameter is specified, it is used as a speed-up multiplier. For
-example, a speed-up of 2 makes
+If the third parameter is specified, it is used as a speed-up multiplier.
+For example, a speed-up of 2 makes
.B scriptreplay
-go twice as fast and a speed-up of 0.1 makes it go ten times slower
+go twice as fast, and a speed-up of 0.1 makes it go ten times slower
than the original session.
.SH OPTIONS
-The options will overide old style arguments.
+The first three options will overide old-style arguments.
.TP
-.BR \-t , " \-\-timing FILE"
+.BR \-t , " \-\-timing " \fIfile\fR
File containing script timing output.
.TP
-.BR \-s , " \-\-typescript FILE"
-Script terminal output file.
+.BR \-s , " \-\-typescript " \fIfile\fR
+File containing the script terminal output.
.TP
-.BR \-d , " \-\-divisor NUM"
-Speed up or slow down replay displaying by divisor. The argument
-is floating point number.
+.BR \-d , " \-\-divisor " \fInumber\fR
+Speed up the replay displaying this \fInumber\fR of times.
+The argument is a floating point number. It's called divisor
+because it divides the timings by this factor.
.TP
.BR \-V , " \-\-version"
-Print version information.
+Display version information and exit.
.TP
.BR \-h , " \-\-help"
-Print a help message.
+Display a help message and exit.
.SH "EXAMPLE"
.IX Header "EXAMPLE"
.Vb 7
--
1.7.0.4
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0006-TODO-drop-the-pluralization-item-with-ngettext.patch --]
[-- Type: text/x-patch; name="0006-TODO-drop-the-pluralization-item-with-ngettext.patch", Size: 975 bytes --]
From acd90fd8836aca007bc6a9cf519f4ee6f4791f50 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 20 Aug 2011 11:33:38 +0200
Subject: [PATCH 6/6] TODO: drop the pluralization item with ngettext()
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
TODO | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/TODO b/TODO
index 4f1678d..cab1ff7 100644
--- a/TODO
+++ b/TODO
@@ -225,15 +225,6 @@ misc
- move all mountpoints to the newroot (there are hardcoded /proc /sys and /dev paths now)
- add --dont-move[=<list of dirs>] options
- - use ngettext() for strings with plurals, for example
-
- /* include/nls.h */
- #define P_(id, id_plural, n) ngettext(id, id_plural, n)
-
- printf(P_("%d used sector",
- "%d used sectors", sectors),
- sectors);
-
- use TZ=UTC and LANG=en_US.UTF-8 for tests
- add mllockall() and SCHED_FIFO to hwclock,
--
1.7.0.4
^ permalink raw reply related
* Re: man-pages and usage() howto
From: Benno Schulenberg @ 2011-08-20 9:10 UTC (permalink / raw)
To: kerolasa; +Cc: Karel Zak, util-linux
In-Reply-To: <CAG27Bk3Kvzy+cLCaGh885XLo-MsYY3i5q6_380b_DE8KxXmaNA@mail.gmail.com>
On Wed, 17 Aug 2011 15:07 +0200, "Sami Kerola" <kerolasa@iki.fi> wrote:
> On Tue, Aug 16, 2011 at 12:39, Karel Zak <kzak@redhat.com> wrote:
> >
> > --date <time>
> >
> > the important is visual difference between static option name
> > and variable option argument.
>
> Diamond brackets make visual difference to look quite nice. I do
> like this.
Yes, it does look better than all uppercase, so I'll accept.
(That I stuck to uppercase is because it wastes less space,
and with just 80 characters width this sometimes matters,
plus it seemed widespread tradition.)
> -n, --no-argument this option requires no_argument
> -o, --optional[=arg] this option has optional_argument
> -r, --required <arg> this option requires required_argument
The middle one would need the pointy brackets, too, no?
-o, --optional[=<arg>] this option has optional_argument
> > I'm just working on Benno's patches and I found that we need
> > some explicitly defined rules for usage():
> >
> > - "Usage:" and "Options:" use separate lines and strings, before
> > the sections has to be empty line:
> >
> > fputs(_("\nUsage:\n"), out);
> > ...
> > fputs(_("\nOptions:\n"), out);
> >
> > (so this two string will be translated only once)
As a translator I do not quite like the separation of the
"\nUsage:\n" string from the actual synopsis -- it is good
to have some context in the string. But I'll accept. The
initial space of the actual synopsis strings will eventually
let translators understand what they are.
> How putting to c.h the following?
>
> #define USAGE_HEADER _("\nUsage:\n")
> #define USAGE_OPTIONS _("\nOptions:\n")
> #define USAGE_SHORT_TAIL _("\n")
> #define USAGE_MAN_TAIL _("For more details see %s.")
Especially the latter would be nice: at the moment there are
many such lines with just a differing final word.
> Having also definition for OPTION_HELP && OPTION_VERSION would be
> good.
That won't work -- the amount of indentation for the option description
is not the same for all utilities. And to make it the same for all would
create ugly and unneeded wide open text spaces for some tools.
> > I made the decision, --option <argument>. [...]
> >
> > It would be also nice to sync man pages with usage() format.
Do you mean that you want to use "--option <argument>" also in the
man pages, Karel? Or do we stick there to italics for arguments?
(Which translates to underlining on terminals.)
Regards,
Benno
--
http://www.fastmail.fm - Email service worth paying for. Try it for free
^ permalink raw reply
* Subject: [PATCH] docs: update ReleaseNotes: fix typo in v2.20-ReleaseNotes
From: Bernhard Voelker @ 2011-08-18 15:28 UTC (permalink / raw)
To: util-linux
From 9ad6c574cb38cdc4123ed1e5e4b6290d3011c300 Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Thu, 18 Aug 2011 17:25:09 +0200
Subject: [PATCH] docs: update ReleaseNotes: fix typo in v2.20-ReleaseNotes
Signed-off-by: Bernhard Voelker <mail@bernhard-voelker.de>
---
docs/v2.20-ReleaseNotes | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/docs/v2.20-ReleaseNotes b/docs/v2.20-ReleaseNotes
index f393cac..4e9253e 100644
--- a/docs/v2.20-ReleaseNotes
+++ b/docs/v2.20-ReleaseNotes
@@ -1,7 +1,7 @@
Util-linux 2.20 Release Notes
=============================
- The ddate(1) command is not build by default (see --enable-ddate).
+ The ddate(1) command is not built by default (see --enable-ddate).
Release highlights
------------------
--
1.7.3.4
^ permalink raw reply related
* Re: [PATCH] ddate: St. Tib's Day in other languages
From: Karel Zak @ 2011-08-18 9:31 UTC (permalink / raw)
To: Nick Erdmann; +Cc: util-linux
In-Reply-To: <1976757.PW98uZrV7g@arch>
On Wed, Aug 17, 2011 at 08:35:02PM +0200, Nick Erdmann wrote:
> In other languages than english, the translation of "St. Tib's Day" may not
> be 13 bytes long. Example of what happens in german:
> $ ddate 29 2 2008
> St. Tib’s D, 3174 YOLD
>
> Signed-off-by: Nick Erdmann <erdmann@date.upb.de>
> --- a/misc-utils/ddate.c 2011-07-20 21:55:23.000000000 +0200
> +++ b/misc-utils/ddate.c 2011-08-17 18:11:12.437504258 +0200
> @@ -223,6 +223,7 @@
> int tib_start=-1, tib_end=0;
> int i, fmtlen=strlen(fmt);
> char *bufptr=buf;
> + char *foo;
>
> /* fprintf(stderr, "format(%p, \"%s\", dt)\n", buf, fmt);*/
>
> @@ -249,7 +250,9 @@
> for(i=0; i<fmtlen; i++) {
> if((i==tib_start) && (dt.day==-1)) {
> /* handle St. Tib's Day */
> - strcpy(bufptr, _("St. Tib's Day")); bufptr += 13;
> + foo = _("St. Tib's Day");
> + while((*bufptr++=*foo++));
> + --bufptr;
> i=tib_end;
strcpy(bufptr, _("St. Tib's Day"));
bufptr += strlen(bufptr);
seems more readable.
Anyway, the horrible code does not check the size of the bufptr, etc.
I'm still surprised that we have this crazy thing in util-linux
package and it's enabled by default. I'll probably add --enable-ddate.
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply
* [PATCH] sfdisk: make some tests conditional to !Linux
From: Giulio @ 2011-08-18 7:30 UTC (permalink / raw)
To: util-linux
This patch makes the following tests/actions conditional to "!Linux":
- Force cylinders as format instead of MB, even if user asked for MB.
This solves a bug where if you use "-L -uM", set 1 as starting MB and the
disk is larger than a certain size (about 1GB) the partition would start at
sector 1 instead of 1MB due to cyl rounding.
- Warn about partitions not starting/ending on cyl boundaries.
- Check if CHS is ok.
I used the "!Linux" notation since it was already used elsewhere in the
code.
Sorry, I don't use git, hope this is ok.
Signed-off-by: Giulio Orsero <giulioo@pobox.com>
---
--- a/fdisk/sfdisk.c 2011-08-17 17:17:43.000000000 +0200
+++ b/fdisk/sfdisk.c 2011-08-17 22:48:52.000000000 +0200
@@ -1315,7 +1315,7 @@ partitions_ok(struct disk_desc *z) {
* The first partition starts after MBR.
* Logical partitions start slightly after the containing extended partn.
*/
- if (B.cylindersize) {
+ if (B.cylindersize && !Linux) {
for (p = partitions; p < partitions + partno; p++)
if (p->size) {
if (p->start % B.cylindersize != 0
@@ -1325,14 +1325,12 @@ partitions_ok(struct disk_desc *z) {
&& (p->p.start_sect >= B.cylindersize)) {
my_warn(_("Warning: partition %s does not start "
"at a cylinder boundary\n"), PNO(p));
- if (!Linux)
- return 0;
+ return 0;
}
if ((p->start + p->size) % B.cylindersize) {
my_warn(_("Warning: partition %s does not end "
"at a cylinder boundary\n"), PNO(p));
- if (!Linux)
- return 0;
+ return 0;
}
}
}
@@ -1378,7 +1376,7 @@ partitions_ok(struct disk_desc *z) {
b = p->p.begin_chs;
aa = chs_to_longchs(a);
bb = chs_to_longchs(b);
- if (!chs_ok(b, PNO(p), _("start")))
+ if (!chs_ok(b, PNO(p), _("start")) && !Linux)
return 0;
if (a.s && !is_equal_chs(a, b))
my_warn(_
@@ -1388,7 +1386,7 @@ partitions_ok(struct disk_desc *z) {
b = p->p.end_chs;
aa = chs_to_longchs(a);
bb = chs_to_longchs(b);
- if (!chs_ok(b, PNO(p), _("end")))
+ if (!chs_ok(b, PNO(p), _("end")) && !Linux)
return 0;
if (a.s && !is_equal_chs(a, b))
my_warn(_
@@ -2087,7 +2085,7 @@ read_line(int pno, struct part_desc *ep,
/* use specified format, but round to cylinders if F_MEGABYTE specified */
format = 0;
- if (B.cylindersize && specified_format == F_MEGABYTE)
+ if (B.cylindersize && specified_format == F_MEGABYTE && !Linux)
format = F_CYLINDER;
orig = (one_only ? &(oldp.partitions[pno]) : 0);
^ permalink raw reply
* [PATCH] ddate: St. Tib's Day in other languages
From: Nick Erdmann @ 2011-08-17 18:35 UTC (permalink / raw)
To: util-linux
In other languages than english, the translation of "St. Tib's Day" may not
be 13 bytes long. Example of what happens in german:
$ ddate 29 2 2008
St. Tib’s D, 3174 YOLD
Signed-off-by: Nick Erdmann <erdmann@date.upb.de>
--- a/misc-utils/ddate.c 2011-07-20 21:55:23.000000000 +0200
+++ b/misc-utils/ddate.c 2011-08-17 18:11:12.437504258 +0200
@@ -223,6 +223,7 @@
int tib_start=-1, tib_end=0;
int i, fmtlen=strlen(fmt);
char *bufptr=buf;
+ char *foo;
/* fprintf(stderr, "format(%p, \"%s\", dt)\n", buf, fmt);*/
@@ -249,7 +250,9 @@
for(i=0; i<fmtlen; i++) {
if((i==tib_start) && (dt.day==-1)) {
/* handle St. Tib's Day */
- strcpy(bufptr, _("St. Tib's Day")); bufptr += 13;
+ foo = _("St. Tib's Day");
+ while((*bufptr++=*foo++));
+ --bufptr;
i=tib_end;
} else {
if(fmt[i]=='%') {
^ permalink raw reply
* Re: [PATCH] tests: grammar fixes
From: Karel Zak @ 2011-08-17 16:08 UTC (permalink / raw)
To: Davidlohr Bueso; +Cc: util-linux
In-Reply-To: <1313596375.2653.2.camel@offbook>
On Wed, Aug 17, 2011 at 11:52:55AM -0400, Davidlohr Bueso wrote:
> tests/ts/blkid/md-raid1-part | 2 +-
> tests/ts/cramfs/mkfs | 4 ++--
> tests/ts/fdisk/align-512-4K | 2 +-
> tests/ts/fdisk/align-512-4K-63 | 2 +-
> tests/ts/fdisk/align-512-4K-md | 2 +-
> tests/ts/fdisk/align-512-512-topology | 2 +-
> tests/ts/fsck/ismounted | 2 +-
> tests/ts/libmount/tabfiles-tags | 4 ++--
> tests/ts/minix/mkfs | 2 +-
> tests/ts/mount/fstab-broken | 4 ++--
> tests/ts/mount/fstab-devname | 6 +++---
> tests/ts/mount/fstab-devname2label | 4 ++--
> tests/ts/mount/fstab-devname2uuid | 4 ++--
> tests/ts/mount/fstab-label | 8 ++++----
> tests/ts/mount/fstab-label2devname | 6 +++---
> tests/ts/mount/fstab-label2uuid | 8 ++++----
> tests/ts/mount/fstab-symlink | 6 +++---
> tests/ts/mount/fstab-uuid | 8 ++++----
> tests/ts/mount/fstab-uuid2devname | 6 +++---
> tests/ts/mount/fstab-uuid2label | 8 ++++----
> tests/ts/mount/label | 6 +++---
> tests/ts/mount/move | 4 ++--
> tests/ts/mount/regfile | 2 +-
> tests/ts/mount/remount | 4 ++--
> tests/ts/mount/uuid | 6 +++---
> tests/ts/swapon/devname | 4 ++--
> tests/ts/swapon/label | 4 ++--
> tests/ts/swapon/uuid | 4 ++--
> 28 files changed, 62 insertions(+), 62 deletions(-)
Applied, thanks.
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply
* [PATCH] tests: grammar fixes
From: Davidlohr Bueso @ 2011-08-17 15:52 UTC (permalink / raw)
To: Karel Zak; +Cc: util-linux
From: Davidlohr Bueso <dave@gnu.org>
Date: Wed, 17 Aug 2011 11:51:19 -0400
Trivial change, "Cannot found" to "Cannot find".
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
tests/ts/blkid/md-raid1-part | 2 +-
tests/ts/cramfs/mkfs | 4 ++--
tests/ts/fdisk/align-512-4K | 2 +-
tests/ts/fdisk/align-512-4K-63 | 2 +-
tests/ts/fdisk/align-512-4K-md | 2 +-
tests/ts/fdisk/align-512-512-topology | 2 +-
tests/ts/fsck/ismounted | 2 +-
tests/ts/libmount/tabfiles-tags | 4 ++--
tests/ts/minix/mkfs | 2 +-
tests/ts/mount/fstab-broken | 4 ++--
tests/ts/mount/fstab-devname | 6 +++---
tests/ts/mount/fstab-devname2label | 4 ++--
tests/ts/mount/fstab-devname2uuid | 4 ++--
tests/ts/mount/fstab-label | 8 ++++----
tests/ts/mount/fstab-label2devname | 6 +++---
tests/ts/mount/fstab-label2uuid | 8 ++++----
tests/ts/mount/fstab-symlink | 6 +++---
tests/ts/mount/fstab-uuid | 8 ++++----
tests/ts/mount/fstab-uuid2devname | 6 +++---
tests/ts/mount/fstab-uuid2label | 8 ++++----
tests/ts/mount/label | 6 +++---
tests/ts/mount/move | 4 ++--
tests/ts/mount/regfile | 2 +-
tests/ts/mount/remount | 4 ++--
tests/ts/mount/uuid | 6 +++---
tests/ts/swapon/devname | 4 ++--
tests/ts/swapon/label | 4 ++--
tests/ts/swapon/uuid | 4 ++--
28 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index c990824..75630a2 100755
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -34,7 +34,7 @@ modprobe scsi_debug dev_size_mb=51 sector_size=512
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
-[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
+[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"
diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index 37d79c0..0b48d01 100755
--- a/tests/ts/cramfs/mkfs
+++ b/tests/ts/cramfs/mkfs
@@ -68,13 +68,13 @@ DEVICE=$($TS_CMD_LOSETUP -s -f $IMAGE_PATH)
ts_log "check the image"
ts_device_has "TYPE" "cramfs" $DEVICE
-[ "$?" == "0" ] || ts_die "Cannot found cramfs on $DEVICE" $DEVICE
+[ "$?" == "0" ] || ts_die "Cannot find cramfs on $DEVICE" $DEVICE
ts_log "mount the image"
$TS_CMD_MOUNT -r -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
# check it
-ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
cd $TS_MOUNTPOINT
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index cf3bbc0..2bc1280 100755
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -37,7 +37,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512 physblk_exp=3
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
-[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
+[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"
diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index cd44ce4..cd7d2ac 100755
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -37,7 +37,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
-[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
+[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index ba0f0c8..fc2ce69 100755
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -38,7 +38,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512 physblk_exp=3
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
-[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
+[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"
diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 4563765..baf9155 100755
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -37,7 +37,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
-[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
+[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"
diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index fae465c..6b7f0f7 100755
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -30,7 +30,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot found ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags
index 893c65b..87039cc 100755
--- a/tests/ts/libmount/tabfiles-tags
+++ b/tests/ts/libmount/tabfiles-tags
@@ -24,7 +24,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
-[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
+[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"
LABEL="testLibmount"
@@ -34,7 +34,7 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
# Create filesystem
#
mkfs.ext3 -F -L $LABEL $DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
FSTAB="$TS_OUTDIR/fstab"
diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index e74a169..21c3ffe 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -36,7 +36,7 @@ ts_log "mount the filesystem"
$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
# check it
-ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
ts_log "umount the image"
$TS_CMD_UMOUNT $DEVICE
diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
index c256e02..46f272a 100755
--- a/tests/ts/mount/fstab-broken
+++ b/tests/ts/mount/fstab-broken
@@ -37,7 +37,7 @@ ts_init_subtest "mount"
$TS_CMD_MOUNT $MNT &> /dev/null
$TS_CMD_FINDMNT --kernel --target "$MNT" &> /dev/null
if [ "$?" != "0" ]; then
- ts_log "Cannot found $MNT in /proc/self/mountinfo"
+ ts_log "Cannot find $MNT in /proc/self/mountinfo"
else
ts_log "OK"
fi
@@ -49,7 +49,7 @@ ts_init_subtest "mount-all"
$TS_CMD_MOUNT -a &> /dev/null
$TS_CMD_FINDMNT --kernel --target "$MNT" &> /dev/null
if [ "$?" != "0" ]; then
- ts_log "Cannot found $MNT in /proc/self/mountinfo"
+ ts_log "Cannot find $MNT in /proc/self/mountinfo"
else
ts_log "OK"
fi
diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index 04fda9d..9af8db6 100755
--- a/tests/ts/mount/fstab-devname
+++ b/tests/ts/mount/fstab-devname
@@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot found ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
@@ -37,12 +37,12 @@ ts_fstab_add $DEVICE
# variant A)
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
index 25db73f..34214db 100755
--- a/tests/ts/mount/fstab-devname2label
+++ b/tests/ts/mount/fstab-devname2label
@@ -31,14 +31,14 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
ts_fstab_add "LABEL=$LABEL"
$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
index 373e175..859bcda 100755
--- a/tests/ts/mount/fstab-devname2uuid
+++ b/tests/ts/mount/fstab-devname2uuid
@@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@@ -38,7 +38,7 @@ UUID=$(ts_uuid_by_devname $DEVICE)
ts_fstab_add "UUID=$UUID"
$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index 88331f4..2c1e7eb 100755
--- a/tests/ts/mount/fstab-label
+++ b/tests/ts/mount/fstab-label
@@ -31,7 +31,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
@@ -39,17 +39,17 @@ ts_fstab_add "LABEL=$LABEL"
# variant A)
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
# variant C)
$TS_CMD_MOUNT LABEL=$LABEL 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index 88ae748..0d10f1b 100755
--- a/tests/ts/mount/fstab-label2devname
+++ b/tests/ts/mount/fstab-label2devname
@@ -31,7 +31,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
@@ -39,12 +39,12 @@ ts_fstab_add "$DEVICE"
# variant A)
$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index c643e61..0ad4f05 100755
--- a/tests/ts/mount/fstab-label2uuid
+++ b/tests/ts/mount/fstab-label2uuid
@@ -32,9 +32,9 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
-ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@@ -44,12 +44,12 @@ ts_fstab_add "UUID=$UUID"
# variant A)
$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
index 0c1c68d..7f9d91f 100755
--- a/tests/ts/mount/fstab-symlink
+++ b/tests/ts/mount/fstab-symlink
@@ -32,7 +32,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot found ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
@@ -43,7 +43,7 @@ ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user"
# variant A) -- UID=0
$TS_CMD_MOUNT $LINKNAME 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" $DEVICE
# varian B) -- disabled, the $TS_CMD_MOUNT is usually not a real program, but
@@ -55,7 +55,7 @@ $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" $DEVICE
#
#su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" 2>&1 >> $TS_OUTPUT
#ts_is_mounted $DEVICE
-# || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+# || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
#su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" 2>&1 >> $TS_OUTPUT \
# || ts_die "B) Cannot umount $LINKNAME" $DEVICE
diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index 7032c29..8c65b4d 100755
--- a/tests/ts/mount/fstab-uuid
+++ b/tests/ts/mount/fstab-uuid
@@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@@ -39,17 +39,17 @@ ts_fstab_add "UUID=$UUID"
# varian A)
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# varian B)
$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
# varian C)
$TS_CMD_MOUNT UUID=$UUID 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index 99d00b8..51bac14 100755
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/tests/ts/mount/fstab-uuid2devname
@@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@@ -39,12 +39,12 @@ ts_fstab_add "$DEVICE"
# variant A)
$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index e510fc1..442cdb7 100755
--- a/tests/ts/mount/fstab-uuid2label
+++ b/tests/ts/mount/fstab-uuid2label
@@ -31,9 +31,9 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
-ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@@ -43,12 +43,12 @@ ts_fstab_add "LABEL=$LABEL"
# variant A)
$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index 92b1c13..873ea95 100755
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -32,18 +32,18 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
# variant A)
$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/move b/tests/ts/mount/move
index dfdd79a..3862f46 100755
--- a/tests/ts/mount/move
+++ b/tests/ts/mount/move
@@ -35,14 +35,14 @@ $TS_CMD_MOUNT --bind $DIR_SRC $DIR_A
# check the bind
$TS_CMD_FINDMNT --kernel --target "$DIR_A" &> /dev/null
-[ "$?" == "0" ] || ts_die "Cannot found binded $DIR_A in /proc/self/mountinfo"
+[ "$?" == "0" ] || ts_die "Cannot find binded $DIR_A in /proc/self/mountinfo"
# move
$TS_CMD_MOUNT --move $DIR_A $DIR_B
# check the move
$TS_CMD_FINDMNT --kernel --target "$DIR_B" &> /dev/null
-[ "$?" == "0" ] || ts_die "Cannot found binded $DIR_B in /proc/self/mountinfo"
+[ "$?" == "0" ] || ts_die "Cannot find binded $DIR_B in /proc/self/mountinfo"
# clean up
$TS_CMD_UMOUNT $DIR_B
diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile
index 05a28ee..fa5605e 100755
--- a/tests/ts/mount/regfile
+++ b/tests/ts/mount/regfile
@@ -21,7 +21,7 @@ $TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
DEVICE=$(awk '/regfile/ { print $1 }' /proc/mounts)
-grep -q "$TS_MOUNTPOINT" /proc/mounts || ts_die "Cannot found $TS_MOUNTPOINT in /proc/mounts"
+grep -q "$TS_MOUNTPOINT" /proc/mounts || ts_die "Cannot find $TS_MOUNTPOINT in /proc/mounts"
if [ -f "/sys/block/$(basename $DEVICE)/loop" ]; then
$TS_CMD_UMOUNT $IMAGE || ts_die "Cannot umount $IMAGE"
diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount
index 33db5dc..051c595 100755
--- a/tests/ts/mount/remount
+++ b/tests/ts/mount/remount
@@ -35,7 +35,7 @@ $TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT || ts_die "Cannot mount $TS_MOUNTPOINT" $DE
# check the mount
egrep -q "^$DEVICE $TS_MOUNTPOINT" /etc/mtab \
- || ts_die "Cannot found $TS_MOUNTPOINT in /etc/mtab" $DEVICE
+ || ts_die "Cannot find $TS_MOUNTPOINT in /etc/mtab" $DEVICE
# remount
$TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT \
@@ -43,7 +43,7 @@ $TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT \
# check the remount
$TS_CMD_FINDMNT --kernel --target "$TS_MOUNTPOINT" --options "ro" &> /dev/null
-[ "$?" == "0" ] || ts_die "Cannot found read-only in $TS_MOUNTPOINT in /proc/self/mountinfo"
+[ "$?" == "0" ] || ts_die "Cannot find read-only in $TS_MOUNTPOINT in /proc/self/mountinfo"
ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index 3a47d50..e29ad39 100755
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@@ -37,12 +37,12 @@ UUID=$(ts_uuid_by_devname $DEVICE)
# variant A)
$TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname
index e2ac048..917b40b 100755
--- a/tests/ts/swapon/devname
+++ b/tests/ts/swapon/devname
@@ -30,12 +30,12 @@ DEVICE=$(ts_device_init)
$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
|| ts_die "Cannot make swap $DEVICE" $DEVICE
-ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot found swap on $DEVICE" $DEVICE
+ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE
LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \
$TS_CMD_SWAPON $DEVICE 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/swaps || ts_die "Cannot found $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
ts_swapoff $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label
index 0cb650a..3a5baa1 100755
--- a/tests/ts/swapon/label
+++ b/tests/ts/swapon/label
@@ -32,12 +32,12 @@ $TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \
|| ts_die "Cannot make swap on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \
$TS_CMD_SWAPON -L $LABEL 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/swaps || ts_die "Cannot found $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
ts_swapoff $DEVICE
ts_device_deinit $DEVICE
diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid
index bbcafa2..413b46b 100755
--- a/tests/ts/swapon/uuid
+++ b/tests/ts/swapon/uuid
@@ -30,14 +30,14 @@ DEVICE=$(ts_device_init)
$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
|| ts_die "Cannot make swap $DEVICE" $DEVICE
-ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \
$TS_CMD_SWAPON -U $UUID 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/swaps || ts_die "Cannot found $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
ts_swapoff $DEVICE
ts_device_deinit $DEVICE
--
1.7.4.1
^ permalink raw reply related
* Re: losetup --all --verbose results in usage
From: Bernhard Voelker @ 2011-08-17 15:01 UTC (permalink / raw)
To: Karel Zak; +Cc: util-linux
In-Reply-To: <20110817144433.GD699@nb.net.home>
On 08/17/2011 04:44 PM, Karel Zak wrote:
> On Wed, Aug 17, 2011 at 04:12:53PM +0200, Bernhard Voelker wrote:
>> I was surprised that running
>> mount/losetup --all --verbose
>> results in usage().
>
> Fixed. losetup -a -v works now.
>
> Karel
uh, that was fast.
Thanks.
Berny
^ permalink raw reply
* Re: losetup --all --verbose results in usage
From: Bernhard Voelker @ 2011-08-17 14:55 UTC (permalink / raw)
To: dave; +Cc: util-linux
In-Reply-To: <1313590941.2653.1.camel@offbook>
On 08/17/2011 04:22 PM, Davidlohr Bueso wrote:
> On Wed, 2011-08-17 at 16:12 +0200, Bernhard Voelker wrote:
>> I was surprised that running
>> mount/losetup --all --verbose
>> results in usage().
...
> I'm actually rewriting this tool to make use of our new loop library.
> I'll address this issue here as well, thanks for the heads up.
great - I have to thank you!
Have a nice day,
Berny
^ permalink raw reply
* Re: losetup --all --verbose results in usage
From: Karel Zak @ 2011-08-17 14:44 UTC (permalink / raw)
To: Bernhard Voelker; +Cc: util-linux
In-Reply-To: <4E4BCC65.2060100@bernhard-voelker.de>
On Wed, Aug 17, 2011 at 04:12:53PM +0200, Bernhard Voelker wrote:
> I was surprised that running
> mount/losetup --all --verbose
> results in usage().
Fixed. losetup -a -v works now.
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply
* Re: losetup --all --verbose results in usage
From: Davidlohr Bueso @ 2011-08-17 14:22 UTC (permalink / raw)
To: Bernhard Voelker; +Cc: util-linux
In-Reply-To: <4E4BCC65.2060100@bernhard-voelker.de>
On Wed, 2011-08-17 at 16:12 +0200, Bernhard Voelker wrote:
> I was surprised that running
> mount/losetup --all --verbose
> results in usage().
>
> As -a is the option to list all used loop devices,
> one might think that -v adds some more info to the output.
>
The verbose option is quite broken, yes.
> Neither --help nor the man pages nor the info page tells
> that -a doesn't accept other options:
>
> mount/lomount.c (line 1133):
>
> } else if (all) {
> if (argc > 2)
> usage(stderr);
>
> Should we work on this?
I'm actually rewriting this tool to make use of our new loop library.
I'll address this issue here as well, thanks for the heads up.
- Davidlohr
^ permalink raw reply
* losetup --all --verbose results in usage
From: Bernhard Voelker @ 2011-08-17 14:12 UTC (permalink / raw)
To: util-linux
I was surprised that running
mount/losetup --all --verbose
results in usage().
As -a is the option to list all used loop devices,
one might think that -v adds some more info to the output.
Neither --help nor the man pages nor the info page tells
that -a doesn't accept other options:
mount/lomount.c (line 1133):
} else if (all) {
if (argc > 2)
usage(stderr);
Should we work on this?
If it's not possible to output more information with
-v, then it would maybe make sense to ignore it, right?
Have a nice day,
Berny
^ permalink raw reply
* Re: sfdisk: trying to create aligned partitions: fail
From: Giulio Orsero @ 2011-08-17 13:46 UTC (permalink / raw)
To: Karel Zak; +Cc: util-linux
In-Reply-To: <20110817124400.GA699@nb.net.home>
On Wed, Aug 17, 2011 at 14:44, Karel Zak <kzak@redhat.com> wrote:
> On Wed, Aug 17, 2011 at 11:31:56AM +0200, Giulio wrote:
>> I know sfdisk won't automatically align partitions and didn't expect it =
to
>> do it, my email was about sfdisk behaving in an unexpected way:
>> - not respecting 1MB as start of partition when I ask for it
>> - creating partitions out of order when using sectors
>
> =C2=A0Try --in-order command line option, the option is undocumented in o=
ld
> =C2=A0versions ;-(
With "--in-order" the issue with partitions out of order (the case in
which I was using -uS) is solved.
However, there still is an isse when using -uM
I was trying with a 200GB VMware disk and when I used -uM and 1 as
start of 1st partition sfdisk would create a partition starting at
sector 1 (not MB 1).
I see you used a 100MB disk, so I tried different sizes until I found
when the error appears, unfortunately I'm not able to fine grain sizes
in VMware more than the following:
=3D=3D command used
DEV=3D$1
dd if=3D/dev/zero of=3D/dev/$DEV bs=3D1 count=3D512
sfdisk --in-order -L -uM /dev/$DEV <<-EOF
1,10,83
,,83
;
;
EOF
=3D=3D
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D with a 1062MB, OK:
Disk /dev/sdc: 1062 MB, 1062207488 bytes
64 heads, 32 sectors/track, 1013 cylinders, total 2074624 sectors
Units =3D sectors of 1 * 512 =3D 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sdc1 2048 22527 10240 83 Linux
<=3D=3D=3D=3D start sector 2048
/dev/sdc2 22528 2074623 1026048 83 Linux
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D with a 1073MB, NOT-OK:
Disk /dev/sdb: 1073 MB, 1073741824 bytes
255 heads, 63 sectors/track, 130 cylinders, total 2097152 sectors
Units =3D sectors of 1 * 512 =3D 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sdb1 1 32129 16064+ 83 Linux
<=3D=3D=3D=3D=3D start sector 1
/dev/sdb2 32130 2088449 1028160 83 Linux
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Thanks
^ permalink raw reply
* Re: man-pages and usage() howto
From: Sami Kerola @ 2011-08-17 13:07 UTC (permalink / raw)
To: Karel Zak; +Cc: Benno Schulenberg, util-linux
In-Reply-To: <20110816104652.GA14535@nb.net.home>
On Tue, Aug 16, 2011 at 12:39, Karel Zak <kzak@redhat.com> wrote:
> On Mon, Aug 15, 2011 at 09:12:16PM +0200, Sami Kerola wrote:
>> I used GNU notation which has 'unnecessary' equals sign.
> [...]
>> IMHO the visual unity is better.
>
> I understand, but I'm not sure about readability... well, I
> have asked my colleagues and the winer is:
>
> --date <time>
>
> the important is visual difference between static option name
> and variable option argument.
Diamond brackets make visual difference to look quite nice. I do
like this.
-n, --no-argument this option requires no_argument
-o, --optional[=3Darg] this option has optional_argument
-r, --required <arg> this option requires required_argument
> You can hate me, but we need any decision. I'll cleanup the
> usage() strings now.
Hate? No way! Decision after fair discussion is something I
greatly value, even I could have had heretic wrong opinions
during conversation. The hate is reserved for unjust decisions.
>> So the howto should tell how do you know you are dealing with
>> fundamental difference of outcome, which requires multiple
>> synopsis lines. Obvious trap seems to be such hermeneutic
>> circle that no-one understands what the howto tries to say.
>> Rigour rejection until the text is good is needed.
>
> I think we have to use common sense here. Sometimes multiple
> synopsis lines makes sense (losetup -h ?). There is not
> necessary any strict rule.
I likely made that sound over complicated. I know what I want to
mean, the next thing is to write it understandable way down. Key
word is not write but understandable, which makes this difficult
if anything.
> I'm just working on Benno's patches and I found that we need
> some explicitly defined rules for usage():
>
> - "Usage:" and "Options:" use separate lines and strings, before
> the sections has to be empty line:
>
> fputs(_("\nUsage:\n"), out);
> ...
> fputs(_("\nOptions:\n"), out);
>
> (so this two string will be translated only once)
How putting to c.h the following?
#define USAGE_HEADER _("\nUsage:\n")
#define USAGE_OPTIONS _("\nOptions:\n")
#define USAGE_SHORT_TAIL _("\n")
#define USAGE_MAN_TAIL _("For more details see %s.")
Rest should be obvious.
Having also definition for OPTION_HELP && OPTION_VERSION would be
good.
> - all lines with options and synopsis are prefixed
> by ***one*** space (0x40):
>
> fputs(_("\nUsage:\n"), out);
> fprintf(out,
> _(" %s [options]\n"), something);
>
> fputs(_("\nOptions:\n"), out);
> fputs(_(" -b, --bar this is bar\n");
Assuming we end up using definitions this does not have to be
that specific.
> - in the code all strings with options have to start at the same
> position. It means:
>
> fprintf(out, _(" -x[=3D<foo>] default foo is %s"), x);
> fputs( _(" -y some text"), out);
I agree.
> - the first and last usage() output line is empty
>
> - the last line does not have to be empty if there is
> additional info about a man page "For more details see
> foo(1)."
Yes, and the definitions...
> - use manageable chunks for the usage strings (one or few lines)
Sound reasonable, I'll add this to howto.
> - separator between short and long options is comma and one space:
> " -x, --long-x "
I agree, and adding to howto is needed.
On Tue, Aug 16, 2011 at 12:46, Karel Zak <kzak@redhat.com> wrote:
> On Tue, Aug 16, 2011 at 11:03:44AM +0200, Benno Schulenberg wrote:
>> > command [options] file
>>
>> If in the usage() help text the arguments of options are
>> written in uppercase, wouldn't it be more consistent to then
>> also write the
>
> It depends, Semi's version is uppercase, but my (findmnt,
> blkid, lsblk, ...) is <lowercase> :-)
I made my own office vote. The seasoned command line guys, by
clear margin, voted for lower case. Explanation why I wrote
originally with upper case was a copy how GNU does it, but as the
results show people do not like it.
>> About the other things I have not yet an opinion.
>
> I made the decision, --option <argument>. We can play with it
> little bit more in the next release. Now I'd like to release
> it...
>
> It would be also nice to sync man pages with usage() format.
> Note that man pages changes are acceptable for -rc2.
Sounds that the version 2.21 will have hefty amount of usage(),
man page and documentation changes. I hope all is done by Jan
2012.
--=20
=A0=A0 Sami Kerola
=A0=A0 http://www.iki.fi/kerolasa/
^ permalink raw reply
* Re: sfdisk: trying to create aligned partitions: fail
From: Karel Zak @ 2011-08-17 12:44 UTC (permalink / raw)
To: giulioo; +Cc: util-linux
In-Reply-To: <20110817093146.860D9F815@i3.golden.dom>
On Wed, Aug 17, 2011 at 11:31:56AM +0200, Giulio wrote:
> I know sfdisk won't automatically align partitions and didn't expect it to
> do it, my email was about sfdisk behaving in an unexpected way:
> - not respecting 1MB as start of partition when I ask for it
> - creating partitions out of order when using sectors
Try --in-order command line option, the option is undocumented in old
versions ;-(
sfdisk --in-order -L -uM /dev/sdb <<-EOF
1,10,83
,,83
;
;
EOF
result (output from fdisk):
Device Boot Start End Blocks Id System
/dev/sdb1 2048 22527 10240 83 Linux
/dev/sdb2 22528 204799 91136 83 Linux
sfdisk --in-order -L -uS /dev/sdb <<-EOF
2048,8000,83
,,83
;
;
EOF
result (output from fdisk):
Device Boot Start End Blocks Id System
/dev/sdb1 2048 10047 4000 83 Linux
/dev/sdb2 10048 204799 97376 83 Linux
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply
* [PATCH] fdisk: print a message with size and type of created partition
From: Francesco Cosoleto @ 2011-08-17 11:21 UTC (permalink / raw)
To: util-linux; +Cc: Francesco Cosoleto
In-Reply-To: <1313533146-2806-1-git-send-email-cosoleto@gmail.com>
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
---
fdisk/Makefile.am | 2 +-
fdisk/fdisk.c | 13 +++++++++++++
fdisk/fdisk.h | 1 +
fdisk/fdisksgilabel.c | 9 ++++++++-
fdisk/fdisksunlabel.c | 4 ++++
5 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
index 7cad805..4409db5 100644
--- a/fdisk/Makefile.am
+++ b/fdisk/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = README.fdisk README.cfdisk sfdisk.examples partitiontype.c
fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \
$(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \
- $(top_srcdir)/lib/mbsalign.c
+ $(top_srcdir)/lib/mbsalign.c $(top_srcdir)/lib/strutils.c
if LINUX
fdisk_common += $(top_srcdir)/lib/linux_version.c
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 038536d..a08a4d4 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -32,6 +32,7 @@
#include "wholedisk.h"
#include "pathnames.h"
#include "canonicalize.h"
+#include "strutils.h"
#include "fdisksunlabel.h"
#include "fdisksgilabel.h"
@@ -614,6 +615,10 @@ set_partition(int i, int doext, unsigned long long start,
p->sys_ind = sysid;
set_start_sect(p, start - offset);
set_nr_sects(p, stop - start + 1);
+
+ if (!doext)
+ print_partition_size(i + 1, start, stop, sysid);
+
if (dos_compatible_flag && (start/(sectors*heads) > 1023))
start = heads*sectors*1024 - 1;
set_hsc(p->head, p->sector, p->cyl, start);
@@ -2319,6 +2324,14 @@ get_unused_start(int part_n,
return start;
}
+void print_partition_size(int num, unsigned long long start, unsigned long long stop, int sysid)
+{
+ char *str = size_to_human_string(SIZE_SUFFIX_3LETTER | SIZE_SUFFIX_SPACE,
+ (stop - start + 1) * sector_size);
+ printf(_("Partition %d of type %s and of size %s is set\n"), num, partition_type(sysid), str);
+ free(str);
+}
+
static void
add_partition(int n, int sys) {
char mesg[256]; /* 48 does not suffice in Japanese */
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 9b7f4c7..e289043 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -75,6 +75,7 @@ extern struct partition *get_part_table(int);
extern int valid_part_table_flag(unsigned char *b);
extern unsigned int read_int(unsigned int low, unsigned int dflt,
unsigned int high, unsigned int base, char *mesg);
+extern void print_partition_size(int num, unsigned long long start, unsigned long long stop, int sysid);
extern unsigned char *MBRbuffer;
extern void zeroize_mbr_buffer(void);
diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 8179bc1..3595909 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -570,6 +570,8 @@ sgi_set_partition(int i, unsigned int start, unsigned int length, int sys) {
set_changed(i);
if (sgi_gaps() < 0) /* rebuild freelist */
printf(_("Do You know, You got a partition overlap on the disk?\n"));
+ if (length)
+ print_partition_size(i + 1, start, start + length, sys);
}
static void
@@ -733,7 +735,6 @@ create_sgilabel(void)
old[i].sysid = get_part_table(i)->sys_ind;
old[i].start = get_start_sect(get_part_table(i));
old[i].nsect = get_nr_sects(get_part_table(i));
- printf(_("Trying to keep parameters of partition %d.\n"), i);
if (debug)
printf(_("ID=%02x\tSTART=%d\tLENGTH=%d\n"),
old[i].sysid, old[i].start, old[i].nsect);
@@ -741,6 +742,12 @@ create_sgilabel(void)
}
}
+ for (i = 0; i < 4; i++)
+ if (old[i].sysid) {
+ printf(_("Trying to keep parameters of partitions already set.\n"));
+ break;
+ }
+
zeroize_mbr_buffer();
sgilabel->magic = SSWAP32(SGI_LABEL_MAGIC);
sgilabel->boot_part = SSWAP16(0);
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index 9335e75..7d3aa09 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -106,6 +106,7 @@ static void set_sun_partition(int i, uint32_t start, uint32_t stop, uint16_t sys
sunlabel->partitions[i].num_sectors =
SSWAP32(stop - start);
set_changed(i);
+ print_partition_size(i + 1, start, stop, sysid);
}
void sun_nolabel(void)
@@ -250,6 +251,9 @@ void create_sunlabel(void)
} else
ndiv = cylinders * 2 / 3;
+ /* Make sure print_partition_size() uses correct sysid names */
+ disklabel = SUN_LABEL;
+
set_sun_partition(0, 0, ndiv * heads * sectors,
SUN_TAG_LINUX_NATIVE);
set_sun_partition(1, ndiv * heads * sectors,
--
1.7.3.4
^ permalink raw reply related
* Re: sfdisk: trying to create aligned partitions: fail
From: Giulio @ 2011-08-17 9:31 UTC (permalink / raw)
To: Karel Zak; +Cc: util-linux
In-Reply-To: <20110817075613.GB28856@nb.net.home>
On Wed, 17 Aug 2011 09:56:13 +0200, Karel Zak <kzak@redhat.com> wrote:
>On Wed, Aug 17, 2011 at 08:13:06AM +0200, Giulio wrote:
>> Linux 2.6.18-238.12.1.el5
>> sfdisk from util-linux 2.20-rc1
>> fdisk (util-linux 2.20-rc1)
>> 200GB VMware SCSI disk
>>
>> It seems it's not immediately possible to create aligned partitions (ie:
>> starting at 1MB/2048 sectors) with sfdisk.
>
> This is unsupported by sfdisk and cfdisk. You have to use fdisk or
> parted.
What is unsupported?
I know sfdisk won't automatically align partitions and didn't expect it to
do it, my email was about sfdisk behaving in an unexpected way:
- not respecting 1MB as start of partition when I ask for it
- creating partitions out of order when using sectors
Maybe I chose the wrong subject, I was trying to align partition manually
and sfidk won't let me do it.
Thanks.
^ permalink raw reply
* Re: sfdisk: trying to create aligned partitions: fail
From: Karel Zak @ 2011-08-17 7:56 UTC (permalink / raw)
To: giulioo; +Cc: util-linux
In-Reply-To: <20110817061256.BB29DF815@i3.golden.dom>
On Wed, Aug 17, 2011 at 08:13:06AM +0200, Giulio wrote:
> Linux 2.6.18-238.12.1.el5
> sfdisk from util-linux 2.20-rc1
> fdisk (util-linux 2.20-rc1)
> 200GB VMware SCSI disk
>
> It seems it's not immediately possible to create aligned partitions (ie:
> starting at 1MB/2048 sectors) with sfdisk.
This is unsupported by sfdisk and cfdisk. You have to use fdisk or
parted.
I'll add a note about it to the man page...
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply
* sfdisk: trying to create aligned partitions: fail
From: Giulio @ 2011-08-17 6:13 UTC (permalink / raw)
To: util-linux
Linux 2.6.18-238.12.1.el5
sfdisk from util-linux 2.20-rc1
fdisk (util-linux 2.20-rc1)
200GB VMware SCSI disk
It seems it's not immediately possible to create aligned partitions (ie:
starting at 1MB/2048 sectors) with sfdisk.
1) 1st try, using MBs as unit of measure:
dd if=/dev/zero of=/dev/sda bs=1 count=512
sfdisk -L -uM /dev/sda <<-EOF
1,1001,83
,,83
;
;
EOF
Results (starts at sector 1 instead of 1MB):
$ fdisk -lu /dev/sda
Disk /dev/sda: 214.7 GB, 214748364800 bytes
255 heads, 63 sectors/track, 26108 cylinders, total 419430400 sectors
Units = sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 1 2056319 1028159+ 83 Linux
/dev/sda2 2056320 419425019 208684350 83 Linux
2) 2nd try, using sectors as unit of measure:
dd if=/dev/zero of=/dev/sda bs=1 count=512
sfdisk -L -uS /dev/sda <<-EOF
2048,2050048,83
,,83
;
;
EOF
Results (wrong 2nd partition created):
$ fdisk -lu /dev/sda
Disk /dev/sda: 214.7 GB, 214748364800 bytes
255 heads, 63 sectors/track, 26108 cylinders, total 419430400 sectors
Units = sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 2048 2052095 1025024 83 Linux
/dev/sda2 1 2047 1023+ 83 Linux
/dev/sda3 2052096 419430399 208689152 83 Linux
Partition table entries are not in disk order
===
Is there some option to enable alignment?
Thanks
^ permalink raw reply
* [PATCH 5/5] tests: update fdisk and blkid MD tests
From: Francesco Cosoleto @ 2011-08-16 22:19 UTC (permalink / raw)
To: util-linux; +Cc: Francesco Cosoleto
In-Reply-To: <1313533146-2806-1-git-send-email-cosoleto@gmail.com>
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
---
tests/expected/blkid/md-raid0-whole | 11 +++++++----
tests/expected/blkid/md-raid1-part | 11 +++++++----
tests/expected/blkid/md-raid1-whole | 13 ++++++++-----
tests/expected/fdisk/align-512-4K | 24 ++++++++++++++++--------
tests/expected/fdisk/align-512-4K-63 | 24 ++++++++++++++++--------
tests/expected/fdisk/align-512-4K-md | 24 +++++++++++++++---------
tests/expected/fdisk/align-512-512 | 24 ++++++++++++++++--------
tests/expected/fdisk/align-512-512-topology | 24 ++++++++++++++++--------
tests/functions.sh | 1 +
9 files changed, 102 insertions(+), 54 deletions(-)
diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole
index 54e4012..83fc54e 100644
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -3,21 +3,24 @@ Create RAID device
Create partitions on RAID device
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-204543, default 204543):
+Last sector, +sectors or +size{K,M,G} (2048-204543, default 204543): Partition 1 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (22528-204543, default 22528): Using default value 22528
Last sector, +sectors or +size{K,M,G} (22528-204543, default 204543): Using default value 204543
+Partition 2 of type Linux and of size 88.9 MiB is set
Command (m for help):
Disk /dev/md8: 104 MB, 104726528 bytes
diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index 659f896..df595b8 100644
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -1,21 +1,24 @@
Create partitions
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-104447, default 104447):
+Last sector, +sectors or +size{K,M,G} (2048-104447, default 104447): Partition 1 of type Linux and of size 25 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (53248-104447, default 53248): Using default value 53248
Last sector, +sectors or +size{K,M,G} (53248-104447, default 104447): Using default value 104447
+Partition 2 of type Linux and of size 25 MiB is set
Command (m for help):
Disk /dev/...: 53 MB, 53477376 bytes
diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index cbdbb7b..2536a5c 100644
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -3,21 +3,24 @@ Create RAID device
Create partitions on RAID device
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-102271, default 102271):
+Last sector, +sectors or +size{K,M,G} (2048-102271, default 102271): Partition 1 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (22528-102271, default 22528): Using default value 22528
-Last sector, +sectors or +size{K,M,G} (22528-102271, default 102271):
+Last sector, +sectors or +size{K,M,G} (22528-102271, default 102271): Partition 2 of type Linux and of size 10 MiB is set
+
Command (m for help):
Disk /dev/md8: 52 MB, 52363264 bytes
2 heads, 4 sectors/track, 12784 cylinders, total 102272 sectors
diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index ed1e03b..615d609 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -1,49 +1,57 @@
Create partitions
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
The device presents a logical sector size that is smaller than
the physical sector size. Aligning to a physical sector (or optimal
I/O) size boundary is recommended, or performance may be impacted.
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): Partition 1 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
-Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): Partition 2 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (2 primary, 0 extended, 2 free)
e extended
Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
-Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Partition 3 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (3 primary, 0 extended, 1 free)
e extended
Select (default e): Selected partition 4
First sector (63488-102399, default 63488): Using default value 63488
Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399
+Partition 4 of type Extended and of size 19 MiB is set
Command (m for help): All primary partitions are in use
Adding logical partition 5
First sector (65536-102399, default 65536): Using default value 65536
-Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): Partition 5 of type Linux and of size 5 MiB is set
+
Command (m for help): All primary partitions are in use
Adding logical partition 6
First sector (77824-102399, default 77824): Using default value 77824
-Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): Partition 6 of type Linux and of size 5 MiB is set
+
Command (m for help): All primary partitions are in use
Adding logical partition 7
First sector (90112-102399, default 90112): Using default value 90112
Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399
+Partition 7 of type Linux and of size 6 MiB is set
Command (m for help):
Disk /dev/...: 52 MB, 52428800 bytes
diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 261f54c..63cef9c 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -1,49 +1,57 @@
Create partitions
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
The device presents a logical sector size that is smaller than
the physical sector size. Aligning to a physical sector (or optimal
I/O) size boundary is recommended, or performance may be impacted.
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (7-102399, default 7): Using default value 7
-Last sector, +sectors or +size{K,M,G} (7-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (7-102399, default 102399): Partition 1 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (20487-102399, default 20487): Using default value 20487
-Last sector, +sectors or +size{K,M,G} (20487-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (20487-102399, default 102399): Partition 2 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (2 primary, 0 extended, 2 free)
e extended
Select (default p): Partition number (1-4, default 3): First sector (40967-102399, default 40967): Using default value 40967
-Last sector, +sectors or +size{K,M,G} (40967-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (40967-102399, default 102399): Partition 3 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (3 primary, 0 extended, 1 free)
e extended
Select (default e): Selected partition 4
First sector (61447-102399, default 61447): Using default value 61447
Last sector, +sectors or +size{K,M,G} (61447-102399, default 102399): Using default value 102399
+Partition 4 of type Extended and of size 20 MiB is set
Command (m for help): All primary partitions are in use
Adding logical partition 5
First sector (61454-102399, default 63487): Using default value 63487
-Last sector, +sectors or +size{K,M,G} (63487-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (63487-102399, default 102399): Partition 5 of type Linux and of size 5 MiB is set
+
Command (m for help): All primary partitions are in use
Adding logical partition 6
First sector (61454-102399, default 75775): Using default value 75775
-Last sector, +sectors or +size{K,M,G} (75775-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (75775-102399, default 102399): Partition 6 of type Linux and of size 5 MiB is set
+
Command (m for help): All primary partitions are in use
Adding logical partition 7
First sector (61454-102399, default 88063): Using default value 88063
Last sector, +sectors or +size{K,M,G} (88063-102399, default 102399): Using default value 102399
+Partition 7 of type Linux and of size 7 MiB is set
Command (m for help):
Disk /dev/...: 52 MB, 52428800 bytes
diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 7de6d2e..3a0e7d5 100644
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -1,25 +1,28 @@
Create partitions
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
The device presents a logical sector size that is smaller than
the physical sector size. Aligning to a physical sector (or optimal
I/O) size boundary is recommended, or performance may be impacted.
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): Partition 1 of type Linux and of size 20 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (43008-102399, default 43008): Using default value 43008
Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using default value 102399
+Partition 2 of type Linux and of size 29 MiB is set
Command (m for help):
Disk /dev/...: 52 MB, 52428800 bytes
@@ -43,25 +46,28 @@ Alignment offsets:
Create partitions (MD)
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
The device presents a logical sector size that is smaller than
the physical sector size. Aligning to a physical sector (or optimal
I/O) size boundary is recommended, or performance may be impacted.
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (2048-100095, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-100095, default 100095):
+Last sector, +sectors or +size{K,M,G} (2048-100095, default 100095): Partition 1 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (22528-100095, default 22528): Using default value 22528
-Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095):
+Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095): Partition 2 of type Linux and of size 10 MiB is set
+
Command (m for help):
Disk /dev/md8: 51 MB, 51249152 bytes
2 heads, 4 sectors/track, 12512 cylinders, total 100096 sectors
diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index 13931d4..7f1cdb9 100644
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -1,45 +1,53 @@
Create partitions
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): Partition 1 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
-Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): Partition 2 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (2 primary, 0 extended, 2 free)
e extended
Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
-Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Partition 3 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (3 primary, 0 extended, 1 free)
e extended
Select (default e): Selected partition 4
First sector (63488-102399, default 63488): Using default value 63488
Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399
+Partition 4 of type Extended and of size 19 MiB is set
Command (m for help): All primary partitions are in use
Adding logical partition 5
First sector (65536-102399, default 65536): Using default value 65536
-Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): Partition 5 of type Linux and of size 5 MiB is set
+
Command (m for help): All primary partitions are in use
Adding logical partition 6
First sector (77824-102399, default 77824): Using default value 77824
-Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): Partition 6 of type Linux and of size 5 MiB is set
+
Command (m for help): All primary partitions are in use
Adding logical partition 7
First sector (90112-102399, default 90112): Using default value 90112
Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399
+Partition 7 of type Linux and of size 6 MiB is set
Command (m for help):
Disk /dev/loop0: 52 MB, 52428800 bytes
diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index af86955..3623f0b 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -1,45 +1,53 @@
Create partitions
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
-Changes will remain in memory only, until you decide to write them.
-After that, of course, the previous content won't be recoverable.
-
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
+
+Changes will remain in memory only, until you decide to write them.
+Be careful before using the write command.
+
Command (m for help): Partition type:
p primary (0 primary, 0 extended, 4 free)
e extended
Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): Partition 1 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (1 primary, 0 extended, 3 free)
e extended
Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
-Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): Partition 2 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (2 primary, 0 extended, 2 free)
e extended
Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
-Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Partition 3 of type Linux and of size 10 MiB is set
+
Command (m for help): Partition type:
p primary (3 primary, 0 extended, 1 free)
e extended
Select (default e): Selected partition 4
First sector (63488-102399, default 63488): Using default value 63488
Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399
+Partition 4 of type Extended and of size 19 MiB is set
Command (m for help): All primary partitions are in use
Adding logical partition 5
First sector (65536-102399, default 65536): Using default value 65536
-Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): Partition 5 of type Linux and of size 5 MiB is set
+
Command (m for help): All primary partitions are in use
Adding logical partition 6
First sector (77824-102399, default 77824): Using default value 77824
-Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399):
+Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): Partition 6 of type Linux and of size 5 MiB is set
+
Command (m for help): All primary partitions are in use
Adding logical partition 7
First sector (90112-102399, default 90112): Using default value 90112
Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399
+Partition 7 of type Linux and of size 6 MiB is set
Command (m for help):
Disk /dev/...: 52 MB, 52428800 bytes
diff --git a/tests/functions.sh b/tests/functions.sh
index acfbbee..71ff7da 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -398,5 +398,6 @@ function ts_fdisk_clean {
[ x"${DEVNAME}" != x"" ] && sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT
sed -i -e 's/Disk identifier:.*//g' \
-e 's/Building a new.*//g' \
+ -e 's/Welcome to fdisk.*//g' \
$TS_OUTPUT
}
--
1.7.3.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox