summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2012-11-12 13:23:19 +0100
committerKarel Zak2012-11-12 13:23:19 +0100
commitead259e325367b1752d63dbbdb63dc53cd1c632b (patch)
tree7af1da281758a882426df92403ae546865f5858b
parentlosetup: add --list and --output option (diff)
downloadkernel-qcow2-util-linux-ead259e325367b1752d63dbbdb63dc53cd1c632b.tar.gz
kernel-qcow2-util-linux-ead259e325367b1752d63dbbdb63dc53cd1c632b.tar.xz
kernel-qcow2-util-linux-ead259e325367b1752d63dbbdb63dc53cd1c632b.zip
docs: mark old losetup output format as DEPRECATED
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--Documentation/TODO6
-rw-r--r--Documentation/deprecated.txt18
-rw-r--r--sys-utils/losetup.85
3 files changed, 22 insertions, 7 deletions
diff --git a/Documentation/TODO b/Documentation/TODO
index 6b4f2ad56..e9faa5506 100644
--- a/Documentation/TODO
+++ b/Documentation/TODO
@@ -12,12 +12,6 @@ lscpu
- detect more hypervisors, see 'virt-what' shell script
http://people.redhat.com/~rjones/virt-what/
-losetup
--------
- - add new option --list and --output <columns> to print details about
- one or all (-a) devices by lib/tt.c output. For example people hate
- the hex devno in the default output.
-
dmesg
-----
diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt
index 8797805b6..2d43cb0ae 100644
--- a/Documentation/deprecated.txt
+++ b/Documentation/deprecated.txt
@@ -24,6 +24,24 @@ Why: the option -s is in collision with the Loop-AES losetup dialect that is use
--------------------------
+What: losetup output format without --list
+
+ deprecated format"
+
+ # losetup -a
+ /dev/loop0: []: (/home/fs-images/swap.img)
+ /dev/loop1: []: (/home/fs-images/disk.img), offset 100
+
+ new format:
+
+ # losetup
+ NAME SIZELIMIT OFFSET AUTOCLEAR RO BACK-FILE
+ /dev/loop0 0 0 0 0 /home/fs-images/swap.img
+ /dev/loop1 0 100 0 0 /home/fs-images/disk.img
+
+--------------------------
+
+
What: elvtune
Why: useless for kernel >= 2.6.9
diff --git a/sys-utils/losetup.8 b/sys-utils/losetup.8
index 9613e46ce..bbab44bc5 100644
--- a/sys-utils/losetup.8
+++ b/sys-utils/losetup.8
@@ -67,6 +67,8 @@ to detach loop devices and to query the status of a loop device. If only the
\fIloopdev\fP argument is given, the status of the corresponding loop
device is shown.
+Note that the old output format (e.g. losetup -a) with comma delimited strings is
+deprecated in favour of the --list output format (e.g. losetup -a -l).
.SH OPTIONS
+The \fIsize\fR and \fIoffset\fR arguments may be followed by the multiplicative
+suffixes KiB=1024, MiB=1024*1024, and so on for GiB, TiB, PiB, EiB, ZiB and YiB
@@ -75,7 +77,8 @@ device is shown.
.IP "\fB\-a, \-\-all\fP"
show status of all loop devices. Note that not all information are accessible
-for non-root users. See also \fB\-\-list\fP.
+for non-root users. See also \fB\-\-list\fP. The old output format (as printed
+without --list) is deprecated.
.IP "\fB\-c, \-\-set-capacity\fP \fIloopdev\fP
force loop driver to reread size of the file associated with the specified loop device
.IP "\fB\-d, \-\-detach\fP \fIloopdev\fP..."